BGE patch: new Physics button and margin parameter in Logic panel. Change subversion.
[blender-staging.git] / source / gameengine / Converter / BL_BlenderDataConversion.cpp
index 19fb9d01cbf8ae1dd99256a021b56f8e06db4108..8bdec219354df7a15b2fe343fd6649c6f1f2c2ff 100644 (file)
@@ -1279,6 +1279,10 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
        //int userigidbody = SYS_GetCommandLineInt(syshandle,"norigidbody",0);
        //bool bRigidBody = (userigidbody == 0);
 
+       // object has physics representation?
+       if (!(blenderobject->gameflag & OB_PHYSICS))
+               return;
+
        // get Root Parent of blenderobject
        struct Object* parent= blenderobject->parent;
        while(parent && parent->parent) {
@@ -1310,6 +1314,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 
        objprop.m_isCompoundChild = isCompoundChild;
        objprop.m_hasCompoundChildren = (blenderobject->gameflag & OB_CHILD) != 0;
+       objprop.m_margin = blenderobject->margin;
 
        if ((objprop.m_isactor = (blenderobject->gameflag & OB_ACTOR)!=0))
        {