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

Rearrange _stateset member variable to avoid compile warning

Browse Source
This commit is contained in:
Robert Osfield
2007-09-04 09:00:38 +00:00
parent 177a8ec2ec
commit efc7ff6b02
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/osgUtil/StateGraph
View File

@@ -48,6 +48,12 @@ class OSGUTIL_EXPORT StateGraph : public osg::Referenced
StateGraph* _parent;
#ifdef OSGUTIL_RENDERBACKEND_USE_REF_PTR
osg::ref_ptr<const osg::StateSet> _stateset;
#else
const osg::StateSet* _stateset;
#endif
int _depth;
ChildList _children;
LeafList _leaves;
@@ -96,11 +102,9 @@ class OSGUTIL_EXPORT StateGraph : public osg::Referenced
const osg::Referenced* getUserData() const { return _userData.get(); }
#ifdef OSGUTIL_RENDERBACKEND_USE_REF_PTR
osg::ref_ptr<const osg::StateSet> _stateset;
const osg::StateSet* getStateSet() const { return _stateset.get(); }
#else
const osg::StateSet* _stateset;
const osg::StateSet* getStateSet() const { return _stateset.get(); }
const osg::StateSet* getStateSet() const { return _stateset; }
#endif
/** return true if all of drawables, lights and children are empty.*/