Changeset 3536 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Mar 13, 2005, 11:57:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: GL_TEXTURE_2D-patch: now only enabled and disabled through Material

File:

• orxonox/trunk/src/lib/graphics/importer/material.cc (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/material.cc

@@ -153 +153 @@
 
   if (this->diffuseTextureSet)
-    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    {
+      glEnable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
+    }
   else
-    glBindTexture(GL_TEXTURE_2D, 0);
-  
+    {
+      glDisable(GL_TEXTURE_2D);
+      glBindTexture(GL_TEXTURE_2D, 0);
+    }
 }