Changeset 8611

Show
Ignore:
Timestamp:
07/16/08 17:58:51
Author:
robert
Message:

Cleaned up the updateStateSet code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/src/osgFX/MultiTextureControl.cpp

    r7905 r8611  
    4444void MultiTextureControl::updateStateSet() 
    4545{ 
    46 #if 0 
    47     osg::StateSet* stateset = getOrCreateStateSet(); 
    48     stateset->clear(); 
    49 #else 
    50     // temporary measure to avoid multi-threaded crash 
    51     osg::StateSet* stateset = new osg::StateSet; 
    52 #endif 
     46    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet; 
    5347     
    5448    unsigned int numTextureUnitsOn = 0; 
    …… 
    152146    }  
    153147 
    154     setStateSet(stateset); 
     148    setStateSet(stateset.get()); 
    155149} 
    156150