svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenkernel / intern / collision.c
index 04c5caf138a3e5fa323f6188cb69e59050a21385..59ef6526d3a0c22e063c4faa3e17175cd12dd28b 100644 (file)
@@ -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))