Commit: d5b88e62ca9196479a3cb51c12bd1c91a5514d29
Author: Ines Almeida
Date: Fri Jul 4 11:48:38 2014 +0100
https://developer.blender.org/rBd5b88e62ca9196479a3cb51c12bd1c91a5514d29
Fixing own mistake
===================================================================
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 0900094..954b58c 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1392,8 +1392,7 @@ static void BL_CreatePhysicsObjectNew(KX_GameObject*
gameobj,
/* When the parent is not OB_DYNAMIC and has no OB_COLLISION then it
gets no bullet controller
* and cant be apart of the parents compound shape, same goes for
OB_SOFT_BODY */
if (parent && (parent->gameflag & (OB_DYNAMIC | OB_COLLISION))) {
-
- if (parent && (parent->gameflag & (OB_DYNAMIC | OB_COLLISION))
&& !(parent->gameflag & OB_SOFT_BODY)) {
+ if( (parent->gameflag & OB_CHILD)!=0 &&
(blenderobject->gameflag & OB_CHILD) && !(parent->gameflag & OB_SOFT_BODY)) {
isCompoundChild = true;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
