Fix BGE bug: BGE will crash if objects with display debug property is deleted (bad practice anyway). The actual deletion is now postponed until end of scene

2 files changed, 14 insertions, 0 deletions

diff --git a/source/gameengine/GameLogic/SCA_IScene.cpp b/source/gameengine/GameLogic/SCA_IScene.cpp
index d4463196379..a2f0693b475 100644
--- a/source/gameengine/GameLogic/SCA_IScene.cpp
+++ b/source/gameengine/GameLogic/SCA_IScene.cpp
@@ -30,11 +30,22 @@
  */
 
 #include "SCA_IScene.h"
+#include "Value.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+SCA_DebugProp::SCA_DebugProp(): m_obj(NULL)
+{
+}
+
+SCA_DebugProp::~SCA_DebugProp()
+{
+	if (m_obj) 
+		m_obj->Release(); 
+}
+
 SCA_IScene::SCA_IScene()
 {
 }
@@ -64,6 +75,7 @@ void SCA_IScene::AddDebugProperty(class CValue* debugprop,
 {
 	SCA_DebugProp* dprop = new SCA_DebugProp();
 	dprop->m_obj = debugprop;
+	debugprop->AddRef();
 	dprop->m_name = name;
 	m_debugList.push_back(dprop);
 }
diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h
index 3c62ec91515..5aa631f6b4d 100644
--- a/source/gameengine/GameLogic/SCA_IScene.h
+++ b/source/gameengine/GameLogic/SCA_IScene.h
@@ -40,6 +40,8 @@ struct SCA_DebugProp
 {
 	class CValue*	m_obj;
 	STR_String 		m_name;
+	SCA_DebugProp();
+	~SCA_DebugProp();
 };
 
 class SCA_IScene