[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16777] trunk/blender/source: make gui backwards compatible with this weeks softbody blend files

Erwin Coumans blender at erwincoumans.com
Sun Sep 28 05:17:52 CEST 2008


Revision: 16777
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16777
Author:   erwin
Date:     2008-09-28 05:17:45 +0200 (Sun, 28 Sep 2008)

Log Message:
-----------
make gui backwards compatible with this weeks softbody blend files

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_logic.c
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp

Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c	2008-09-28 03:07:13 UTC (rev 16776)
+++ trunk/blender/source/blender/src/buttons_logic.c	2008-09-28 03:17:45 UTC (rev 16777)
@@ -2983,6 +2983,10 @@
 	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, "");

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2008-09-28 03:07:13 UTC (rev 16776)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2008-09-28 03:17:45 UTC (rev 16777)
@@ -1394,7 +1394,7 @@
 			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;
 





More information about the Bf-blender-cvs mailing list