Modified Files:

	src/Main/renderer.cxx src/Model/panelnode.hxx: Make it compile with
	current osg svn.

diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index 237435c97dcadcf309c11a1de219f3445049f460..f3dd310c5358a7a7c8ac681f25894b0882028de3 100644 (file)
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -121,7 +121,9 @@ public:
     stateSet->setMode(GL_FOG, osg::StateAttribute::OFF);
     stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
   }
-  virtual void drawImplementation(osg::State& state) const
+  virtual void drawImplementation(osg::RenderInfo& renderInfo) const
+  { drawImplementation(*renderInfo.getState()); }
+  void drawImplementation(osg::State& state) const
   {
     state.pushStateSet(getStateSet());
     state.apply();
@@ -184,7 +186,9 @@ public:
 
     stateSet->setTextureAttribute(0, new osg::TexEnv(osg::TexEnv::MODULATE));
   }
-  virtual void drawImplementation(osg::State& state) const
+  virtual void drawImplementation(osg::RenderInfo& renderInfo) const
+  { drawImplementation(*renderInfo.getState()); }
+  void drawImplementation(osg::State& state) const
   {
     state.pushStateSet(getStateSet());
     state.apply();

diff --git a/src/Model/panelnode.hxx b/src/Model/panelnode.hxx
index 0745e5d2472d2ed36489ebf1cc5db4c2064307fe..9a5bf938a61bc2c41435592d18e431f74ce19025 100644 (file)
--- a/src/Model/panelnode.hxx
+++ b/src/Model/panelnode.hxx
@@ -33,7 +33,9 @@ public:
 
     FGPanel* getPanel() { return _panel; }
 
-    virtual void drawImplementation(osg::State& state) const;
+    virtual void drawImplementation(osg::RenderInfo& renderInfo) const
+    { drawImplementation(*renderInfo.getState()); }
+    void drawImplementation(osg::State& state) const;
     virtual osg::BoundingBox computeBound() const;
 
 private: