diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-03 06:49:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-03 06:49:21 +0400 |
| commit | 8e232af37c34740928b6be3b08a236310a78fa6f (patch) | |
| tree | 670e644c241b2be846ebb4b3a50b184e68ff7a28 /source/blender/blenkernel/intern/collision.c | |
| parent | ee22fe7bacee9d7089b8a318fb435fe0c449c24f (diff) | |
| parent | 6b4bdf621f2830ceff2c44f871523a312422a338 (diff) | |
svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 04c5caf138a..59ef6526d3a 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1488,8 +1488,8 @@ static CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, sdis = clmd->coll_parms->distance_repel + epsilon2 + FLT_EPSILON; - /*apply a repulsion force, to help the solver along. - this is kindof crude, it only tests one vert of the triangle*/ + /* apply a repulsion force, to help the solver along. + * this is kindof crude, it only tests one vert of the triangle */ if (isect_ray_plane_v3(cloth->verts[collpair->ap1].tx, n2, collmd->current_xnew[collpair->bp1].co, collmd->current_xnew[collpair->bp2].co, collmd->current_xnew[collpair->bp3].co, &l, 0)) |