Merge fix
Merge branch 'Zardoz89-GLTexture_parameters' into develop