diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-06-05 14:52:52 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-06-05 14:52:52 +0400 |
commit | 3d51c59034be1c3410ab5d2224cb0ef3b35f0ea1 (patch) | |
tree | fc5ad81015cc824148dcc37d20041aba9e22bd2a /source/blender/blenkernel/intern/collision.c | |
parent | ded6a1c2e7aaadcd982b22fdfeeedc436000182f (diff) |
Bugfix for exploding cloth collisions
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index fc9a8132aaf..1809617fb3c 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -683,7 +683,8 @@ CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap collpair->distance = distance; collpair->flag = 0; - } + collpair++; + }/* else { float w1, w2, w3, u1, u2, u3; @@ -716,9 +717,9 @@ CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap { // check for collision in the future collpair->flag |= COLLISION_IN_FUTURE; + collpair++; } - } - collpair++; + }*/ } return collpair; } |