diff --git a/CMakeLists.txt b/CMakeLists.txt index 19fb4d489..601154766 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/src/osgWrappers/serializers/osg/Drawable.cpp b/src/osgWrappers/serializers/osg/Drawable.cpp index 42ebfb195..24e21609a 100644 --- a/src/osgWrappers/serializers/osg/Drawable.cpp +++ b/src/osgWrappers/serializers/osg/Drawable.cpp @@ -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