Fix #30702: game engine softbody weld threshold was exposed in UI, but actually
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 28 Mar 2012 12:18:25 +0000 (12:18 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 28 Mar 2012 12:18:25 +0000 (12:18 +0000)
disabled in code because it doesn't work well, so hide the property from the UI.

release/scripts/startup/bl_ui/properties_game.py
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp

index 16e14a7ead463fc33694a92d083919bc2934ba21..cc3e8a8e57d576c8b4ba2b7758e9d8cfc6935424 100644 (file)
@@ -122,7 +122,8 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
             col = split.column()
             col.label(text="Attributes:")
             col.prop(game, "mass")
-            col.prop(soft, "weld_threshold")
+            # disabled in the code
+            # col.prop(soft, "weld_threshold")
             col.prop(soft, "location_iterations")
             col.prop(soft, "linear_stiffness", slider=True)
             col.prop(soft, "dynamic_friction", slider=True)
index e26c5b6a7bfa0801256fb021388e966194c7fa6b..e0e8e2d9b3f729c1d144e328c6572e23e155970d 100644 (file)
@@ -209,7 +209,7 @@ void        KX_ConvertBulletObject( class   KX_GameObject* gameobj,
                                shapeInfo->SetMesh(meshobj, dm, false);
                        }
 
-                       // Soft bodies require welding. Only avoid remove doubles for non-soft bodies!
+                       // Soft bodies can benefit from welding, don't do it on non-soft bodies
                        if (objprop->m_softbody)
                        {
                                shapeInfo->setVertexWeldingThreshold1(objprop->m_soft_welding); //todo: expose this to the UI