From 0896bd17bd7b7ef3d04a10b22ba2783fe8db6eed Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 24 Jun 2013 11:14:13 +0000 Subject: [PATCH] =?UTF-8?q?From=20Lars=20Nillson,=20"The=20change=20in=20t?= =?UTF-8?q?his=20submission=20is=20to=20take=20care=20of=20the=20setting?= =?UTF-8?q?=20given=20by=20a=20call=20to=20setMaximumNumOfObjectsToCompile?= =?UTF-8?q?PerFrame(=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes if you give a low number, more than the expected number of objects are compiled." --- include/osgUtil/IncrementalCompileOperation | 2 +- src/osgUtil/IncrementalCompileOperation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osgUtil/IncrementalCompileOperation b/include/osgUtil/IncrementalCompileOperation index 6325272f5..8c38371bb 100644 --- a/include/osgUtil/IncrementalCompileOperation +++ b/include/osgUtil/IncrementalCompileOperation @@ -295,7 +295,7 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation virtual ~IncrementalCompileOperation(); - void compileSets(CompileSets& toCompile, CompileInfo compileInfo); + void compileSets(CompileSets& toCompile, CompileInfo& compileInfo); double _targetFrameRate; double _minimumTimeAvailableForGLCompileAndDeletePerFrame; diff --git a/src/osgUtil/IncrementalCompileOperation.cpp b/src/osgUtil/IncrementalCompileOperation.cpp index 6690ed897..0725f0575 100644 --- a/src/osgUtil/IncrementalCompileOperation.cpp +++ b/src/osgUtil/IncrementalCompileOperation.cpp @@ -724,7 +724,7 @@ void IncrementalCompileOperation::operator () (osg::GraphicsContext* context) //glFinish(); } -void IncrementalCompileOperation::compileSets(CompileSets& toCompile, CompileInfo compileInfo) +void IncrementalCompileOperation::compileSets(CompileSets& toCompile, CompileInfo& compileInfo) { osg::NotifySeverity level = osg::INFO;