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 Cameras; ref_ptr _state; - observer_ptr _view; + View* _view; Cameras _cameras; ref_ptr _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 #include #include -#include +#include #include #include