From 647b578ce63a50a93ce78257527bc587d6938f21 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 23 Mar 2018 19:54:33 +0000 Subject: [PATCH] Removed serailizers that are now supplied by osg::Node --- src/osgWrappers/serializers/osg/Drawable.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/osgWrappers/serializers/osg/Drawable.cpp b/src/osgWrappers/serializers/osg/Drawable.cpp index 24e21609a..4f4ae2d12 100644 --- a/src/osgWrappers/serializers/osg/Drawable.cpp +++ b/src/osgWrappers/serializers/osg/Drawable.cpp @@ -41,11 +41,6 @@ REGISTER_OBJECT_WRAPPER( Drawable, } 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 @@ -57,6 +52,15 @@ REGISTER_OBJECT_WRAPPER( Drawable, ADD_OBJECT_SERIALIZER( EventCallback, osg::Callback, NULL ); // _eventCallback ADD_OBJECT_SERIALIZER( CullCallback, osg::Callback, NULL ); // _cullCallback ADD_OBJECT_SERIALIZER( DrawCallback, osg::Drawable::DrawCallback, NULL ); // _drawCallback + { + //now provided by Node's serialization + UPDATE_TO_VERSION_SCOPED( 156 ) + REMOVE_SERIALIZER( StateSet ) + REMOVE_SERIALIZER( UpdateCallback ) + REMOVE_SERIALIZER( EventCallback ) + REMOVE_SERIALIZER( CullCallback ) + REMOVE_SERIALIZER( DrawCallback ) + } { UPDATE_TO_VERSION_SCOPED( 142 )