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

From Paul Martz, "The attached code changes StateSet::merge() so that it copies RenderBin data such as the rendering hint and RenderBin details from rhs into "this", only if "this" has RenderBin mode set to INHERIT.

Browse Source 
It replaces a comment by you indicating something along these lines should be done. To me, this seems like the right thing to do."
This commit is contained in:
Robert Osfield
2008-05-26 21:33:41 +00:00
parent 8f6ca1dc6c
commit 4c81aa0aa7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osg/StateSet.cpp
View File

@@ -774,10 +774,15 @@ void StateSet::merge(const StateSet& rhs)
}
}
// need to merge rendering hints
// but will need to think how best to do this first
// RO, Nov. 2001.
// Merge RenderBin state from rhs into this.
// Only do so if this's RenderBinMode is INHERIT.
if (getRenderBinMode() == INHERIT_RENDERBIN_DETAILS)
{
setRenderingHint( rhs.getRenderingHint() );
setRenderBinMode( rhs.getRenderBinMode() );
setBinNumber( rhs.getBinNumber() );
setBinName( rhs.getBinName() );
}
}