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

From Keith Steffen, fixed bug in StateSet::clear() where parents of texture attributes

Browse Source 
where not being reset correctly due to incorrect ordering of _textureAttributeList.clear().
This commit is contained in:
Robert Osfield 2005-10-03 19:37:54 +00:00
parent e749839061
commit ff9ace16b4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osg/StateSet.cpp
View File

@ -438,6 +438,7 @@ void StateSet::clear()
setRenderBinToInherit();
// remove self from as attributes parent
for(AttributeList::iterator itr=_attributeList.begin();
itr!=_attributeList.end();
@ -450,9 +451,6 @@ void StateSet::clear()
_attributeList.clear();
_textureModeList.clear();
_textureAttributeList.clear();
// remove self from as texture attributes parent
for(unsigned int i=0;i<_textureAttributeList.size();++i)
{
@ -465,6 +463,9 @@ void StateSet::clear()
}
}
_textureModeList.clear();
_textureAttributeList.clear();
// remove self from uniforms parent
for(UniformList::iterator uitr = _uniformList.begin();