Revision: 22669
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22669
Author: campbellbarton
Date: 2009-08-21 05:09:27 +0200 (Fri, 21 Aug 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22625:22668
needed this for 2.5 testing
Modified Paths:
--------------
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
Modified:
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-08-21 03:06:36 UTC (rev 22668)
+++
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-08-21 03:09:27 UTC (rev 22669)
@@ -2404,8 +2404,11 @@
obj->Release();
}
childrenlist->Release();
+
// now destroy recursively
+ converter->UnregisterGameObject(childobj); // removing
objects during conversion make sure this runs too
kxscene->RemoveObject(childobj);
+
continue;
}
Modified:
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-08-21 03:06:36 UTC (rev 22668)
+++
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-08-21 03:09:27 UTC (rev 22669)
@@ -462,10 +462,11 @@
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);
@@ -477,7 +478,6 @@
m_map_blender_to_gameobject.remove(bptr);
}
}
-#endif
}
KX_GameObject *KX_BlenderSceneConverter::FindGameObject(
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
