Merge branch 'master' into 12.0-development

src/modules/graphics/opengl/OpenGL.cpp

@@ -1004,6 +1004,11 @@ void OpenGL::bindTextureToUnit(TextureType target, GLuint texture, int textureun
 		else
 			state.curTextureUnit = textureunit;
 	}
+	else if (!restoreprev && textureunit != state.curTextureUnit)
+	{
+		glActiveTexture(GL_TEXTURE0 + textureunit);
+		state.curTextureUnit = textureunit;
+	}
 }
 
 void OpenGL::bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev)