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

Added automatic assignment of _markerObject to CompileSet.

Browse Source
This commit is contained in:
Robert Osfield
2016-08-15 11:45:58 +01:00
parent e9d6737ec4
commit 06cb31a3d2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgUtil/IncrementalCompileOperation.cpp
View File

@@ -420,7 +420,8 @@ void IncrementalCompileOperation::CompileSet::buildCompileMap(ContextSet& contex
{
if (contexts.empty() || !_subgraphToCompile) return;
StateToCompile stc(mode);
StateToCompile stc(mode, _markerObject.get());
_subgraphToCompile->accept(stc);
buildCompileMap(contexts, stc);
@@ -579,6 +580,9 @@ void IncrementalCompileOperation::add(CompileSet* compileSet, bool callBuildComp
{
if (!compileSet) return;
// pass on the markerObject to the CompileSet
compileSet->_markerObject = _markerObject;
if (compileSet->_subgraphToCompile.valid())
{
// force a compute of the bound of the subgraph to avoid the update traversal from having to do this work