From 8e3bc981a218b669bdc567ca27d856595977475e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 10 Nov 2015 21:45:53 +0100
Subject: [PATCH] Fix self-referencing camera

---
 apps/openmw/mwrender/globalmap.cpp | 10 ++++------
 apps/openmw/mwrender/localmap.cpp  | 12 +++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 3445e4189..1e0a9112f 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -62,9 +62,8 @@ namespace
     class CameraUpdateGlobalCallback : public osg::NodeCallback
     {
     public:
-        CameraUpdateGlobalCallback(osg::Camera* cam, MWRender::GlobalMap* parent)
+        CameraUpdateGlobalCallback(MWRender::GlobalMap* parent)
             : mRendered(false)
-            , mCamera(cam)
             , mParent(parent)
         {
         }
@@ -73,7 +72,7 @@ namespace
         {
             if (mRendered)
             {
-                mCamera->setNodeMask(0);
+                node->setNodeMask(0);
                 return;
             }
 
@@ -82,13 +81,12 @@ namespace
             if (!mRendered)
             {
                 mRendered = true;
-                mParent->markForRemoval(mCamera);
+                mParent->markForRemoval(static_cast<osg::Camera*>(node));
             }
         }
 
     private:
         bool mRendered;
-        osg::ref_ptr<osg::Camera> mCamera;
         MWRender::GlobalMap* mParent;
     };
 
@@ -263,7 +261,7 @@ namespace MWRender
         else
             camera->setClearMask(GL_NONE);
 
-        camera->setUpdateCallback(new CameraUpdateGlobalCallback(camera, this));
+        camera->setUpdateCallback(new CameraUpdateGlobalCallback(this));
 
         camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
         camera->attach(osg::Camera::COLOR_BUFFER, mOverlayTexture);
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index e479119ee..14ec770e8 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -30,22 +30,21 @@ namespace
     class CameraLocalUpdateCallback : public osg::NodeCallback
     {
     public:
-        CameraLocalUpdateCallback(osg::Camera* cam, MWRender::LocalMap* parent)
+        CameraLocalUpdateCallback(MWRender::LocalMap* parent)
             : mRendered(false)
-            , mCamera(cam)
             , mParent(parent)
         {
         }
 
-        virtual void operator()(osg::Node*, osg::NodeVisitor*)
+        virtual void operator()(osg::Node* node, osg::NodeVisitor*)
         {
             if (mRendered)
-                mCamera->setNodeMask(0);
+                node->setNodeMask(0);
 
             if (!mRendered)
             {
                 mRendered = true;
-                mParent->markForRemoval(mCamera);
+                mParent->markForRemoval(static_cast<osg::Camera*>(node));
             }
 
             // Note, we intentionally do not traverse children here. The map camera's scene data is the same as the master camera's,
@@ -55,7 +54,6 @@ namespace
 
     private:
         bool mRendered;
-        osg::ref_ptr<osg::Camera> mCamera;
         MWRender::LocalMap* mParent;
     };
 
@@ -205,7 +203,7 @@ osg::ref_ptr<osg::Camera> LocalMap::createOrthographicCamera(float x, float y, f
     camera->setStateSet(stateset);
     camera->setGraphicsContext(mViewer->getCamera()->getGraphicsContext());
     camera->setViewport(0, 0, mMapResolution, mMapResolution);
-    camera->setUpdateCallback(new CameraLocalUpdateCallback(camera, this));
+    camera->setUpdateCallback(new CameraLocalUpdateCallback(this));
 
     return camera;
 }