sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #30702: game engine softbody weld threshold was exposed in UI, but actually

Browse Source 
disabled in code because it doesn't work well, so hide the property from the UI.
This commit is contained in:
Brecht Van Lommel 2012-03-28 12:18:25 +00:00
parent e12adeb8c9
commit cb45d282fe
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/startup/bl_ui/properties_game.py
View 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)

2
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
View 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