[Bf-blender-cvs] [66d19ebeb3] cloth-improvements: Remove weird impulse scaling

[Luca Rood]

Commit: 66d19ebeb34b0bd18fac96a4d90a09014414be21
Author: Luca Rood
Date:   Thu Jan 12 14:54:43 2017 -0200
Branches: cloth-improvements
https://developer.blender.org/rB66d19ebeb34b0bd18fac96a4d90a09014414be21

Remove weird impulse scaling

===================================================================

M	source/blender/blenkernel/intern/collision.c

===================================================================

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 120b444ce0..a4dfd334d6 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -307,7 +307,10 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM
 			/* Apply velocity stopping impulse
 			 * I_c = m * v_N / 2.0
 			 * no 2.0 * magrelVel normally, but looks nicer DG */
-			impulse =  magrelVel / ( 1.0 + w1*w1 + w2*w2 + w3*w3 );
+			/*impulse =  magrelVel / ( 1.0 + w1*w1 + w2*w2 + w3*w3 );*/
+
+			/* Impulse shoud be uniform throughout polygon, the scaling used above was wrong */
+			impulse =  magrelVel;
 
 			VECADDMUL ( i1, collpair->normal, w1 * impulse );
 			cloth1->verts[collpair->ap1].impulse_count++;