make gui backwards compatible with this weeks softbody blend files
authorErwin Coumans <blender@erwincoumans.com>
Sun, 28 Sep 2008 03:17:45 +0000 (03:17 +0000)
committerErwin Coumans <blender@erwincoumans.com>
Sun, 28 Sep 2008 03:17:45 +0000 (03:17 +0000)
source/blender/src/buttons_logic.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp

index dcb0f8742106d821b2e565dc0d338c9dc8756fd7..58fb2d456b954a5c9a7db0d4b9a6c59269c1bf82 100644 (file)
@@ -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, "");
index 66eed4201eeef08a5c8b731525bccd21661011f6..09b0f063e2afe1551e7587489af35b095919c31d 100644 (file)
@@ -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;