FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up the updateStateSet code

Browse Source
This commit is contained in:
Robert Osfield
2008-07-16 15:58:51 +00:00
parent b068777c22
commit c33f7e5720
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgFX/MultiTextureControl.cpp
View File

@@ -43,13 +43,7 @@ void MultiTextureControl::setTextureWeight(unsigned int unit, float weight)
void MultiTextureControl::updateStateSet()
{
#if 0
osg::StateSet* stateset = getOrCreateStateSet();
stateset->clear();
#else
// temporary measure to avoid multi-threaded crash
osg::StateSet* stateset = new osg::StateSet;
#endif
osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
unsigned int numTextureUnitsOn = 0;
unsigned int unit;
@@ -151,6 +145,6 @@ void MultiTextureControl::updateStateSet()
}
}
setStateSet(stateset);
setStateSet(stateset.get());
}