Merge branch 'master' into 12.0-development

This commit is contained in:
Alex Szpakowski
2020-03-15 19:17:04 -03:00
+5
View File
@@ -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)