[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47357] trunk/blender/source/blender/ blenkernel/intern/collision.c: Cloth collisions: Revert 47335.

[Daniel Genrich]

Revision: 47357
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47357
Author:   genscher
Date:     2012-06-02 22:01:04 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------
Cloth collisions: Revert 47335.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/collision.c

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c	2012-06-02 21:34:25 UTC (rev 47356)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2012-06-02 22:01:04 UTC (rev 47357)
@@ -337,9 +337,10 @@
 			float d = clmd->coll_parms->epsilon*8.0f/9.0f + epsilon2*8.0f/9.0f - collpair->distance;
 			if ( d > ALMOST_ZERO) {
 				// stay on the safe side and clamp repulse
-				float repulse = d;
+				float repulse = d*1.0f/spf;
 
-				float impulse = repulse / (( 1.0f + w1*w1 + w2*w2 + w3*w3 )); // original 2.0 / 0.25
+				float impulse = repulse / ( 3.0 * ( 1.0f + w1*w1 + w2*w2 + w3*w3 )); // original 2.0 / 0.25 
+
 				VECADDMUL ( i1, collpair->normal,  impulse );
 				VECADDMUL ( i2, collpair->normal,  impulse );
 				VECADDMUL ( i3, collpair->normal,  impulse );