svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender.git] / source / gameengine / Converter / BL_BlenderDataConversion.cpp

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 38d4e79ca91e47f19761fa045fb164eab8c94313..b8e53c87fa9b4e104af9e49a67cc45f8a668b712 100644 (file)
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1483,7 +1483,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
                {
                        objprop.m_gamesoftFlag = OB_BSB_BENDING_CONSTRAINTS | OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT;
                        
                {
                        objprop.m_gamesoftFlag = OB_BSB_BENDING_CONSTRAINTS | OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT;
                        

-                       objprop.m_soft_linStiff = 0.5;;
+                       objprop.m_soft_linStiff = 0.5;

                        objprop.m_soft_angStiff = 1.f;          /* angular stiffness 0..1 */
                        objprop.m_soft_volume= 1.f;                     /* volume preservation 0..1 */
 
                        objprop.m_soft_angStiff = 1.f;          /* angular stiffness 0..1 */
                        objprop.m_soft_volume= 1.f;                     /* volume preservation 0..1 */