diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-24 20:06:18 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-24 20:06:18 +0400 |
| commit | 585272fbcf2a23d7491b229736d8de6234ab290b (patch) | |
| tree | 8fef123f9fa44e95e040b1c0df1b1f46392a4e75 /source/blender/blenkernel/intern/collision.c | |
| parent | 1ba29c3a4adde1d9b9a70b9e84745dd0ec5f9c4e (diff) | |
cloth was using edgehash not quite correctly:
- was ordering vertex args unnecessarily.
- was adding the same edges multiple times into the edgehash.
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 91a09bb8554..9a457882ad5 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -865,8 +865,7 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData *clmd, float step, floa if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue; - // check for adjacent points (i must be smaller j) - if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) ) { + if (BLI_edgehash_haskey(cloth->edgehash, i, j)) { continue; } |