fix for own bug added since 2.49a,

2.49a tries to remove the object from the conversion list every time. Now remove from the conversion list directly without being apart of the remove object function.

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 5b03bbbbc4ec1ff210d3e672bf4d6c29c8bc90a6..d2e6bbb43f7d4b86ade1c6bd0602392c09bbdf47 100644 (file)
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -2422,8 +2422,11 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                                        obj->Release();
                        }
                        childrenlist->Release();
+                       
                        // now destroy recursively
+                       converter->UnregisterGameObject(childobj); // removing objects during conversion make sure this runs too
                        kxscene->RemoveObject(childobj);
+                       
                        continue;
                }
 

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 59c073c2b1f38f1749461b5c2652ea9472d89a97..4f47ce7a0368a93400a61e8c5a71cbbef3a220ad 100644 (file)
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -492,10 +492,11 @@ void KX_BlenderSceneConverter::RegisterGameObject(
        m_map_blender_to_gameobject.insert(CHashedPtr(for_blenderobject),gameobject);
 }
 
+/* only need to run this during conversion since
+ * m_map_blender_to_gameobject is freed after conversion */
 void KX_BlenderSceneConverter::UnregisterGameObject(
                                                                        KX_GameObject *gameobject) 
 {
-#if 0
        struct Object *bobp= gameobject->GetBlenderObject();
        if (bobp) {
                CHashedPtr bptr(bobp);
@@ -507,7 +508,6 @@ void KX_BlenderSceneConverter::UnregisterGameObject(
                        m_map_blender_to_gameobject.remove(bptr);
                }
        }
-#endif
 }
 
 KX_GameObject *KX_BlenderSceneConverter::FindGameObject(