Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2008-03-23 01:08:46 +0300
committerDaniel Genrich <daniel.genrich@gmx.net>2008-03-23 01:08:46 +0300
commitcd3cf57842ccda3f07e46f8c59c6cbced07c622a (patch)
treeb74e15918d0d32f9274f3b9aacb6345f657f8c7b /source/blender/blenkernel
parent7e69e7760912800cebc9a112fff0145bdd3e2b72 (diff)
Collision Modifier: 1. Bugfix: Enable hiding in modifier stack again, 2. Bugfix: Recalculate bounding volume if GUI setting changed
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/modifier.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 57b04402b67..8ba80fd914b 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -5299,6 +5299,17 @@ static void collisionModifier_deformVerts(
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)
{