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

Removed Drawable writing out of StateSet as this is now done by Node

Browse Source
This commit is contained in:
Robert Osfield 2018-03-23 18:07:36 +00:00
parent 96b586c165
commit 9634688559
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -4,7 +4,7 @@
SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
SET(OPENSCENEGRAPH_MINOR_VERSION 6)
SET(OPENSCENEGRAPH_PATCH_VERSION 0)
SET(OPENSCENEGRAPH_SOVERSION 155)
SET(OPENSCENEGRAPH_SOVERSION 156)
# set to 0 when not a release candidate, non zero means that any generated

6
src/osgWrappers/serializers/osg/Drawable.cpp
View File

@ -39,7 +39,13 @@ REGISTER_OBJECT_WRAPPER( Drawable,
UPDATE_TO_VERSION_SCOPED( 154 )
ADDED_ASSOCIATE("osg::Node")
}
ADD_OBJECT_SERIALIZER( StateSet, osg::StateSet, NULL ); // _stateset
{
UPDATE_TO_VERSION_SCOPED( 156 )
REMOVE_SERIALIZER( StateSet ) // now provided by Node's serialization of StateSet
}
ADD_USER_SERIALIZER( InitialBound ); // _initialBound
ADD_OBJECT_SERIALIZER( ComputeBoundingBoxCallback,
osg::Drawable::ComputeBoundingBoxCallback, NULL ); // _computeBoundCallback