LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 04:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 12.0-development

Browse Source
This commit is contained in:
Alex Szpakowski
2020-03-15 19:17:04 -03:00
parent 5db1e835ce 9c2454816f
commit c5b6cc3228
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/OpenGL.cpp
+5
View File
@@ -1004,6 +1004,11 @@ void OpenGL::bindTextureToUnit(TextureType target, GLuint texture, int textureun
else else
state.curTextureUnit = textureunit; 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) void OpenGL::bindTextureToUnit(Texture *texture, int textureunit, bool restoreprev)