Revision: 20309
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20309
Author: ben2610
Date: 2009-05-20 23:34:50 +0200 (Wed, 20 May 2009)
Log Message:
-----------
BGE #18664: Incorrect behavior for objects when unparented. A parented object
is made static in all cases.
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-05-20 21:32:56 UTC (rev 20308)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-05-20 21:34:50 UTC (rev 20309)
@@ -1571,8 +1571,8 @@
}
- if (parent && (parent->gameflag & OB_DYNAMIC)) {
-
+ if (parent/* && (parent->gameflag & OB_DYNAMIC)*/) {
+ // parented object cannot be dynamic
KX_GameObject *parentgameobject =
converter->FindGameObject(parent);
objprop.m_dynamic_parent = parentgameobject;
//cannot be dynamic:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs