Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

[flightgear.git] / src / Model / panelnode.hxx

diff --git a/src/Model/panelnode.hxx b/src/Model/panelnode.hxx
index 85f83a0d3b24fa56e5abdf9a58ac7d4e9b2df632..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:
@@ -53,9 +55,9 @@ private:
     // The matrix transformation state that was active the last time
     // we were rendered.  Used by the mouse code to compute
     // intersections.
-    osg::Matrix _lastModelview;
-    osg::Matrix _lastProjection;
-    int   _lastViewport[4];
+    mutable osg::Matrix _lastModelview;
+    mutable osg::Matrix _lastProjection;
+    mutable double _lastViewport[4];
 };