diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 06:29:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-24 06:29:45 +0400 |
| commit | fd4575b2e3e47fb331ac6c9b30fb23cfb05a53ae (patch) | |
| tree | fc22ef5086c488010fbc3d5058198d1686260562 /source/blender/blenkernel/intern/cloth.c | |
| parent | 98f87b77f40b5617409ccc026be604fcaaff9f8e (diff) | |
| parent | f9bffb3ca0ca88a7e774b0ee0da1d384707f0495 (diff) | |
svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
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 4703b75299b..19027647537 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -924,7 +924,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d for(i = 0; i < dm->getNumVerts(dm); i++) { - maxdist = MAX2(maxdist, clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len*2.0)); + maxdist = MAX2(maxdist, clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len*2.0f)); } clmd->clothObject->bvhselftree = bvhselftree_build_from_cloth ( clmd, maxdist ); |