From 28684b1c094a7df9569788956398513609b6948a Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 28 Sep 2008 03:17:45 +0000 Subject: make gui backwards compatible with this weeks softbody blend files --- source/blender/src/buttons_logic.c | 4 ++++ source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index dcb0f874210..58fb2d456b9 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -2983,6 +2983,10 @@ static uiBlock *advanced_bullet_menu(void *arg_ob) Object *ob = arg_ob; short yco = 105, xco = 0; + /* create a BulletSoftBody structure if not already existing */ + if ((ob->body_type & OB_BODY_TYPE_SOFT) && !ob->bsoft) + ob->bsoft = bsbNew(); + block= uiNewBlock(&curarea->uiblocks, "advanced_bullet_options", UI_EMBOSS, UI_HELV, curarea->win); /* use this for a fake extra empy space around the buttons */ uiDefBut(block, LABEL, 0, "", -5, -10, 255, 140, NULL, 0, 0, 0, 0, ""); diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 66eed4201ee..09b0f063e2a 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1394,7 +1394,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, objprop.m_soft_kVC= 0; objprop.m_soft_kDF= 0.2f; - objprop.m_soft_kMT= 0.f; + objprop.m_soft_kMT= 0.05f; objprop.m_soft_kCHR= 1.0f; objprop.m_soft_kKHR= 0.1f; -- cgit v1.2.3