Changed texture params so that non-power-of-2 textures should now work
resolved conflict