From: sapier <Sapier at GMX dot net>
Date: Sun, 7 Apr 2013 18:33:00 +0000 (+0200)
Subject: fix mesh leak in camera class
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=e1146396bc043782b288226c027bc28857ccf4d2;p=zefram%2Fminetest%2Fminetest_engine.git

fix mesh leak in camera class
---

diff --git a/src/camera.cpp b/src/camera.cpp
index 138b022c..735a8d1e 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -69,7 +69,8 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
 	m_view_bobbing_speed(0),
 
 	m_digging_anim(0),
-	m_digging_button(-1)
+	m_digging_button(-1),
+	m_dummymesh(createCubeMesh(v3f(1,1,1)))
 {
 	//dstream<<__FUNCTION_NAME<<std::endl;
 
@@ -84,13 +85,14 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
 	// all other 3D scene nodes and before the GUI.
 	m_wieldmgr = smgr->createNewSceneManager();
 	m_wieldmgr->addCameraSceneNode();
-	m_wieldnode = m_wieldmgr->addMeshSceneNode(createCubeMesh(v3f(1,1,1)), NULL);  // need a dummy mesh
+	m_wieldnode = m_wieldmgr->addMeshSceneNode(m_dummymesh, NULL);  // need a dummy mesh
 }
 
 Camera::~Camera()
 {
-	m_wieldnode->setMesh(NULL);
 	m_wieldmgr->drop();
+
+	delete m_dummymesh;
 }
 
 bool Camera::successfullyCreated(std::wstring& error_message)
diff --git a/src/camera.h b/src/camera.h
index fc43d117..989dcb71 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -173,6 +173,9 @@ private:
 	// If 0, left-click digging animation
 	// If 1, right-click digging animation
 	s32 m_digging_button;
+
+	//dummymesh for camera
+	irr::scene::IAnimatedMesh* m_dummymesh;
 };
 
 #endif