[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14214] trunk/blender/source/blender: Collision Modifier: 1.

[Daniel Genrich]

Revision: 14214
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14214
Author:   genscher
Date:     2008-03-22 23:08:46 +0100 (Sat, 22 Mar 2008)

Log Message:
-----------
Collision Modifier: 1. Bugfix: Enable hiding in modifier stack again, 2. Bugfix: Recalculate bounding volume if GUI setting changed

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/src/buttons_editing.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-03-22 20:54:09 UTC (rev 14213)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-03-22 22:08:46 UTC (rev 14214)
@@ -5299,6 +5299,17 @@
 				memcpy(collmd->current_xnew, collmd->x, numverts*sizeof(MVert));
 				memcpy(collmd->current_x, collmd->x, numverts*sizeof(MVert));
 				
+				/* check if GUI setting has changed for bvh */
+				if(collmd->bvh)
+				{
+					if(ob->pd->pdef_sboft != collmd->bvh->epsilon)
+					{
+						bvh_free(collmd->bvh);
+						collmd->bvh = bvh_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->current_x, numverts, ob->pd->pdef_sboft);
+					}
+			
+				}
+				
 				/* happens on file load (ONLY when i decomment changes in readfile.c */
 				if(!collmd->bvh)
 				{

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2008-03-22 20:54:09 UTC (rev 14213)
+++ trunk/blender/source/blender/src/buttons_editing.c	2008-03-22 22:08:46 UTC (rev 14214)
@@ -1673,7 +1673,7 @@
 	uiBlockSetCol(block, TH_AUTO);
 	
 	/* open/close icon */
-	if (!isVirtual && md->type!=eModifierType_Collision) {
+	if (!isVirtual) {
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 		uiDefIconButBitI(block, ICONTOG, eModifierMode_Expanded, B_MODIFIER_REDRAW, VICON_DISCLOSURE_TRI_RIGHT, x-10, y-2, 20, 20, &md->mode, 0.0, 0.0, 0.0, 0.0, "Collapse/Expand Modifier");
 	}