From f6cc4440a10bf58ed8ddf710d6a9846552e10e9a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 27 Aug 2014 09:25:54 +0000 Subject: [PATCH] Added support for getting osgVolumre::Property::ModifieCount git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14422 16af8721-9629-0410-8352-f15c8da7e697 --- include/osgDB/Serializer | 4 ++-- src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/osgDB/Serializer b/include/osgDB/Serializer index 59cfab7b2..b06ccbb00 100644 --- a/include/osgDB/Serializer +++ b/include/osgDB/Serializer @@ -510,8 +510,8 @@ public: ObjectSerializer( const char* name, P* def, Getter gf, Setter sf ) : ParentType(name, def), _getter(gf), _setter(sf) {} - virtual bool set(osg::Object& obj, void* value) { C& object = OBJECT_CAST(obj); (object.*_setter)( *(reinterpret_cast(value)) ); return true; } - virtual bool get(const osg::Object& obj, void* value) { if (_setter!=0) { const C& object = OBJECT_CAST(obj);*(reinterpret_cast(value )) = (object.*_getter)(); return true; } else return false;} + virtual bool set(osg::Object& obj, void* value) { if (_setter!=0) { C& object = OBJECT_CAST(obj); (object.*_setter)( *(reinterpret_cast(value)) ); return true; } else return false; } + virtual bool get(const osg::Object& obj, void* value) { if (_getter!=0) { const C& object = OBJECT_CAST(obj);*(reinterpret_cast(value )) = (object.*_getter)(); return true; } else return false;} virtual bool read( InputStream& is, osg::Object& obj ) { diff --git a/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp b/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp index cb5518e56..41849effe 100644 --- a/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp +++ b/src/osgWrappers/serializers/osgVolume/VolumeSettings.cpp @@ -7,7 +7,7 @@ REGISTER_OBJECT_WRAPPER( osgVolume_VolumeSettings, new osgVolume::VolumeSettings, osgVolume::VolumeSettings, - "osg::Object osgVolume::VolumeSettings" ) + "osg::Object osgVolume::Property osgVolume::VolumeSettings" ) { ADD_STRING_SERIALIZER( Filename, "" );