diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-02 01:39:13 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-02 01:39:13 +0400 |
| commit | 088899236b0904c0a3d0fc5a92b0cb5ffd35cd17 (patch) | |
| tree | 2d528fb9da3bba533e1ae42d7f2baa823d0d1f2e /source/blender/blenkernel/intern/cloth.c | |
| parent | 7cc98cbb0b6f2ef113a568532eb0921e77cc973d (diff) | |
=trunk=
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.
To use, you need to install liblapack and libblas
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 5eccf724256..ea055e90b45 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -919,7 +919,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++) { |