Changeset 7922 in orxonox.OLD for trunk

Timestamp:

May 28, 2006, 4:02:16 PM (19 years ago)

Author:

bensch

Message:

trunk: reverted change

File:

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

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

@@ -112 +112 @@
     for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
     {
-        //glActiveTexture(Material::glTextureArbs[i]);
+        glActiveTexture(Material::glTextureArbs[i]);
         //glBindTexture(GL_TEXTURE_2D, 0);
         glDisable(GL_TEXTURE_2D);
@@ -149 +149 @@
   for(unsigned int i = 0; i < this->textures.size(); ++i)
   {
-      //glActiveTexture(Material::glTextureArbs[i]);
+      glActiveTexture(Material::glTextureArbs[i]);
       glEnable(GL_TEXTURE_2D);
       if(this->textures[i].hasAlpha())