From 8bae8289243a84fec81bcb38484056bec2858ccd Mon Sep 17 00:00:00 2001 From: Alexander Szpakowski Date: Tue, 1 Jan 2013 04:03:26 -0400 Subject: [PATCH] Don't override texture binding check when calling bindTexture with a texture id of 0 --- src/modules/graphics/opengl/OpenGL.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index 0d8192e9b..0f6289b1a 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -122,7 +122,7 @@ void bindTexture(GLuint texture) { initializeContext(); - if (texture != textureUnits[curTextureUnitIndex] || texture == 0) + if (texture != textureUnits[curTextureUnitIndex]) { textureUnits[curTextureUnitIndex] = texture; glBindTexture(GL_TEXTURE_2D, texture); @@ -138,7 +138,7 @@ void bindTextureToUnit(GLuint texture, GLenum textureunit, bool restoreprev) if (textureunitindex < 0 || (size_t) textureunitindex >= textureUnits.size()) throw love::Exception("Invalid texture unit index."); - if (texture != textureUnits[textureunitindex] || texture == 0) + if (texture != textureUnits[textureunitindex]) { int oldtexunitindex = curTextureUnitIndex; setActiveTextureUnit(textureunit);