From Keith Steffen, fixed bug in StateSet::clear() where parents of texture attributes
where not being reset correctly due to incorrect ordering of _textureAttributeList.clear().
This commit is contained in:
parent
e749839061
commit
ff9ace16b4
@ -438,6 +438,7 @@ void StateSet::clear()
|
||||
|
||||
setRenderBinToInherit();
|
||||
|
||||
|
||||
// remove self from as attributes parent
|
||||
for(AttributeList::iterator itr=_attributeList.begin();
|
||||
itr!=_attributeList.end();
|
||||
@ -449,9 +450,6 @@ void StateSet::clear()
|
||||
_modeList.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();
|
||||
|
Loading…
Reference in New Issue
Block a user