diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-28 16:18:25 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-28 16:18:25 +0400 |
| commit | cb45d282fe0ef5798bdddb7ac984a8a662e73b20 (patch) | |
| tree | 6f67cc5e0ed6810d7013479f72ceb78ecef1e0ae | |
| parent | e12adeb8c98d0ef211aba2cb5c0e87ff775fe217 (diff) | |
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.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 16e14a7ead4..cc3e8a8e57d 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -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) diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index e26c5b6a7bf..e0e8e2d9b3f 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -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 |