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

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

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 4da9143fc3d8177c9335657f8d5368605dc656e3..8ba138df4373ce11460e131a2c2bf900d5eff29e 100644 (file)
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -277,7 +277,9 @@ void                CcdPhysicsController::PostProcessReplica(class PHY_IMotionState* motionsta
                if (m_collisionShape)
                {
                        // new shape has no scaling, apply initial scaling
+                       m_collisionShape->setMargin(m_cci.m_margin);
                        m_collisionShape->setLocalScaling(m_cci.m_scaling);
+                       
                        if (m_cci.m_mass)
                                m_collisionShape->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
                }