Changeset 8312 in orxonox.OLD for trunk/src/lib/graphics/importer/material.cc

Timestamp:

Jun 11, 2006, 12:49:25 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the water-branche back here
removed the HACK in GameWorld in the Process (hope it is not needed anymore…

merged with command:
svn merge ​https://svn.orxonox.net/orxonoanches/water/src/lib/gui/gl_gui src/lib/gui/gl/ -r8063:HEAD

File:

• trunk/src/lib/graphics/importer/material.cc (modified) (2 diffs)

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

@@ -103 +103 @@
  * @brief sets the material with which the following Faces will be painted
  */
-bool Material::select() const
+  bool Material::select() const
 {
   if (unlikely(this == Material::selectedMaterial))
@@ -397 +397 @@
   assert(textureNumber < this->textures.size());
 
-  glActiveTexture(0);
+  // HACK
+  glActiveTexture(textureNumber);
    glEnable(GL_TEXTURE_2D);
    glBindTexture(GL_TEXTURE_2D, this->textures[textureNumber].getTexture());