Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7922 in orxonox.OLD for trunk/src/lib/graphics/importer


Ignore:
Timestamp:
May 28, 2006, 4:02:16 PM (18 years ago)
Author:
bensch
Message:

trunk: reverted change

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/importer/material.cc

    r7921 r7922  
    112112    for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
    113113    {
    114         //glActiveTexture(Material::glTextureArbs[i]);
     114        glActiveTexture(Material::glTextureArbs[i]);
    115115        //glBindTexture(GL_TEXTURE_2D, 0);
    116116        glDisable(GL_TEXTURE_2D);
     
    149149  for(unsigned int i = 0; i < this->textures.size(); ++i)
    150150  {
    151       //glActiveTexture(Material::glTextureArbs[i]);
     151      glActiveTexture(Material::glTextureArbs[i]);
    152152      glEnable(GL_TEXTURE_2D);
    153153      if(this->textures[i].hasAlpha())
Note: See TracChangeset for help on using the changeset viewer.