From: Tim Moore <timoore33@gmail.com>
Date: Thu, 17 Feb 2011 10:39:52 +0000 (+0100)
Subject: fix SGPagedLOD change for 2.8.3
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=956b4406d0e57be455381bcc06a3d5855034e471;p=simgear.git

fix SGPagedLOD change for 2.8.3

One more try...
---

diff --git a/simgear/scene/model/SGPagedLOD.cxx b/simgear/scene/model/SGPagedLOD.cxx
index 531b45b0..f503544a 100644
--- a/simgear/scene/model/SGPagedLOD.cxx
+++ b/simgear/scene/model/SGPagedLOD.cxx
@@ -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)
diff --git a/simgear/scene/model/SGPagedLOD.hxx b/simgear/scene/model/SGPagedLOD.hxx
index 61530de3..25a0e133 100644
--- a/simgear/scene/model/SGPagedLOD.hxx
+++ b/simgear/scene/model/SGPagedLOD.hxx
@@ -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
 };