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 248f377e9a
commit 9797b0f56c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,13 @@ REGISTER_OBJECT_WRAPPER( Drawable,
UPDATE_TO_VERSION_SCOPED( 154 ) UPDATE_TO_VERSION_SCOPED( 154 )
ADDED_ASSOCIATE("osg::Node") ADDED_ASSOCIATE("osg::Node")
} }
ADD_OBJECT_SERIALIZER( StateSet, osg::StateSet, NULL ); // _stateset 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_USER_SERIALIZER( InitialBound ); // _initialBound
ADD_OBJECT_SERIALIZER( ComputeBoundingBoxCallback, ADD_OBJECT_SERIALIZER( ComputeBoundingBoxCallback,
osg::Drawable::ComputeBoundingBoxCallback, NULL ); // _computeBoundCallback osg::Drawable::ComputeBoundingBoxCallback, NULL ); // _computeBoundCallback