Changeset 8037 in orxonox.OLD for trunk/src/lib/graphics/text_engine/text.cc

Timestamp:

May 31, 2006, 4:52:34 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the water back
merged with command
svn merge -r7798:HEAD ​https://svn.orxonox.net/orxonox/branches/water .

conflicts are all resolved

File:

• trunk/src/lib/graphics/text_engine/text.cc (modified) (1 diff)

trunk/src/lib/graphics/text_engine/text.cc

@@ -225 +225 @@
   // setting the Blending effects
   glColor4f(this->color.x, this->color.y, this->color.z, this->blending);
+
+
+  glActiveTexture(GL_TEXTURE0);
+
   glEnable(GL_BLEND);
   glEnable(GL_TEXTURE_2D);