BGE patch: new Physics button and margin parameter in Logic panel. Change subversion.

[blender-staging.git] / source / gameengine / Ketsji / KX_ConvertPhysicsObject.h

diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
index 6653026f28a1b4e4b903a19a9c4610abb1d5f5a2..248d2f49b0b5ff8a01eaa2db03b115cadc929a75 100644 (file)
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
@@ -86,6 +86,7 @@ struct KX_ObjectProperties
        bool    m_disableSleeping;
        bool    m_hasCompoundChildren;
        bool    m_isCompoundChild;
+       double  m_margin;
        KX_BoundBoxClass        m_boundclass;
        union {
                KX_BoxBounds    box;