fix SGPagedLOD change for 2.8.3

One more try...
This commit is contained in:
Tim Moore 2011-02-17 11:39:52 +01:00
parent f106dc2a29
commit 956b4406d0
2 changed files with 6 additions and 4 deletions

View File

@ -46,8 +46,10 @@ SGPagedLOD::~SGPagedLOD()
}
SGPagedLOD::SGPagedLOD(const SGPagedLOD& plod,const CopyOp& copyop)
: osg::PagedLOD(plod, copyop),
_readerWriterOptions(plod._readerWriterOptions)
: osg::PagedLOD(plod, copyop)
#if !SG_PAGEDLOD_HAS_OPTIONS
, _readerWriterOptions(plod._readerWriterOptions)
#endif
{
}
@ -84,7 +86,7 @@ void SGPagedLOD::forceLoad(osgDB::DatabasePager *dbp, FrameStamp* framestamp,
dbp->requestNodeFile(getFileName(childNum), NodePathProxy(path),
priority, framestamp,
getDatabaseRequest(childNum),
_readerWriterOptions.get());
getReaderWriterOptions());
}
bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)

View File

@ -71,7 +71,7 @@ public:
protected:
virtual ~SGPagedLOD();
#if SG_PAGEDLOD_HAS_OPTIONS
#if !SG_PAGEDLOD_HAS_OPTIONS
osg::ref_ptr<osgDB::ReaderWriter::Options> _readerWriterOptions;
#endif
};