[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45246] trunk/blender: Fix #30702: game engine softbody weld threshold was exposed in UI, but actually

[Brecht Van Lommel]

Revision: 45246
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45246
Author:   blendix
Date:     2012-03-28 12:18:25 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
Fix #30702: game engine softbody weld threshold was exposed in UI, but actually
disabled in code because it doesn't work well, so hide the property from the UI.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_game.py
    trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_game.py	2012-03-28 12:18:12 UTC (rev 45245)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_game.py	2012-03-28 12:18:25 UTC (rev 45246)
@@ -122,7 +122,8 @@
             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)

Modified: trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp	2012-03-28 12:18:12 UTC (rev 45245)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp	2012-03-28 12:18:25 UTC (rev 45246)
@@ -209,7 +209,7 @@
 				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