diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-09 03:43:18 +0400 |
| commit | 6ef77cf95accc3cb914e7efd964118ce6e9521cf (patch) | |
| tree | 1d8dbf95355038c93f79f9053a0bf1d55b561ec3 /source/blender/blenkernel/intern/cloth.c | |
| parent | 3462ddf17f38eb61fc3bb2751d55de15a47455c3 (diff) | |
| parent | 770119d16f7dbee99a60d19540818892c970c4e2 (diff) | |
=bmesh= merge from trunk at r36529
Diffstat (limited to 'source/blender/blenkernel/intern/cloth.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 9fabf1d52cf..89e60cc5e0c 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -918,7 +918,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d if(!first) implicit_set_positions(clmd); - clmd->clothObject->bvhtree = bvhtree_build_from_cloth ( clmd, clmd->coll_parms->epsilon ); + clmd->clothObject->bvhtree = bvhtree_build_from_cloth ( clmd, MAX2(clmd->coll_parms->epsilon, clmd->coll_parms->distance_repel) ); for(i = 0; i < dm->getNumVerts(dm); i++) { |