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

Changed the default paramter for the osgUtil::StateToCompile to retain the OSG-3.4 ABI and fixed indentation.

Browse Source
This commit is contained in:
Robert Osfield
2016-08-15 12:13:07 +01:00
parent 06cb31a3d2
commit 9d9025a6b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgUtil/IncrementalCompileOperation
View File

@@ -24,7 +24,7 @@ class OSGUTIL_EXPORT StateToCompile : public osg::NodeVisitor
{
public:
StateToCompile(GLObjectsVisitor::Mode mode, osg::Object* markerObject);
StateToCompile(GLObjectsVisitor::Mode mode, osg::Object* markerObject=0);
typedef std::set<osg::Drawable*> DrawableSet;
typedef std::set<osg::StateSet*> StateSetSet;
@@ -266,7 +266,7 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation
typedef std::map<osg::GraphicsContext*, CompileList > CompileMap;
CompileMap _compileMap;
osg::ref_ptr<osg::Object> _markerObject;
osg::ref_ptr<osg::Object> _markerObject;
protected: