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

[blender-staging.git] / source / gameengine / Physics / Bullet / CcdPhysicsController.h

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index a685c4669441c3314cb665c59bc79a07bcdf1bf1..7d55851ebf66f4bff630c38f4358d25c86a2b6b3 100644 (file)
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -145,6 +145,7 @@ struct CcdConstructionInfo
                m_friction(0.5f),
                m_linearDamping(0.1f),
                m_angularDamping(0.1f),
+               m_margin(0.06f),
                m_collisionFlags(0),
                m_bRigid(false),
                m_collisionFilterGroup(DefaultFilter),
@@ -165,6 +166,7 @@ struct CcdConstructionInfo
        btScalar        m_friction;
        btScalar        m_linearDamping;
        btScalar        m_angularDamping;
+       btScalar        m_margin;
        int                     m_collisionFlags;
        bool            m_bRigid;