Introduced use of MarkerObject to IncrmentalCompileOperation/DatabasePager as a way of marking objects that have already been processed and compiled,
thus avoid potential threading conflicts when paged subgraphs are reused. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14470 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
@@ -23,17 +23,6 @@ using namespace osgDB;
|
||||
|
||||
static std::string s_lastSchema;
|
||||
|
||||
class DummyObject : public osg::Object
|
||||
{
|
||||
public:
|
||||
DummyObject() {}
|
||||
DummyObject(const DummyObject& dummy, const osg::CopyOp& copyop) {}
|
||||
META_Object(osgDB, DummyObject)
|
||||
protected:
|
||||
virtual ~DummyObject() {}
|
||||
};
|
||||
|
||||
|
||||
InputStream::InputStream( const osgDB::Options* options )
|
||||
: _fileVersion(0), _useSchemaData(false), _forceReadingImage(false), _dataDecompress(0)
|
||||
{
|
||||
@@ -78,7 +67,7 @@ InputStream::InputStream( const osgDB::Options* options )
|
||||
}
|
||||
|
||||
// assign dummy object to used for reading field properties that will be discarded.
|
||||
_dummyReadObject = new DummyObject;
|
||||
_dummyReadObject = new osg::DummyObject;
|
||||
}
|
||||
|
||||
InputStream::~InputStream()
|
||||
|
||||
Reference in New Issue
Block a user