From 6196652ef089a1c6785e51567d50f1e08b006d87 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 18 Feb 2010 21:18:49 +0000
Subject: [PATCH] Replaced use of observer_ptr<> with straight C pointer to
 avoid thrashing of an observer_ptr<> every frame.

Changed include to point to new Observer header
---
 include/osg/RenderInfo | 6 +++---
 include/osg/State      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/osg/RenderInfo b/include/osg/RenderInfo
index e2611d505..f91beac63 100644
--- a/include/osg/RenderInfo
+++ b/include/osg/RenderInfo
@@ -53,8 +53,8 @@ public:
     const State* getState() const { return _state.get(); }
     
     void setView(View* view) { _view = view; }
-    View* getView() { return _view.get(); }
-    const View* getView() const { return _view.get(); }
+    View* getView() { return _view; }
+    const View* getView() const { return _view; }
     
     void pushCamera(Camera* camera) { _cameras.push_back(camera); }    
     void popCamera() { if (!_cameras.empty()) _cameras.pop_back(); }
@@ -70,7 +70,7 @@ protected:
     typedef std::vector<Camera*> Cameras;
 
     ref_ptr<State>          _state;
-    observer_ptr<View>      _view;
+    View*                   _view;
     Cameras                 _cameras;
     ref_ptr<Referenced>     _userData;
 };
diff --git a/include/osg/State b/include/osg/State
index b4b9b9d6e..1b6d7e51f 100644
--- a/include/osg/State
+++ b/include/osg/State
@@ -19,7 +19,7 @@
 #include <osg/Matrix>
 #include <osg/Uniform>
 #include <osg/BufferObject>
-#include <osg/observer_ptr>
+#include <osg/Observer>
 
 #include <osg/FrameStamp>
 #include <osg/DisplaySettings>