[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47191] trunk/blender/source/blender/ blenkernel/intern/collision.c: Bugfix [#31629] Cloth simulation results are much different from older ones

[Daniel Genrich]

Revision: 47191
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47191
Author:   genscher
Date:     2012-05-29 19:12:49 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Bugfix [#31629] Cloth simulation results are much different from older ones

This is only a partial bugfix, reducing the repulse to 1/3.

Cloth collision will still behave different because it is now catching more collisions.

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-05-29 18:12:13 UTC (rev 47190)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2012-05-29 19:12:49 UTC (rev 47191)
@@ -332,7 +332,7 @@
 				// stay on the safe side and clamp repulse
 				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.0f * ( 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 );