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

make gui backwards compatible with this weeks softbody blend files

Browse Source
This commit is contained in:
Erwin Coumans 2008-09-28 03:17:45 +00:00
parent f8fb61f9fa
commit 28684b1c09
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/src/buttons_logic.c
View 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, "");

2
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View 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;