[Bf-blender-cvs] [226b284] temp_merge_gooseberry_hair: Fix for rB71271bb, was replacing the force vectors entirely instead of adding.

[Lukas Tönne]

Commit: 226b284565282516b5217dc52f87ce8bb982a560
Author: Lukas Tönne
Date:   Wed Sep 17 11:34:39 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB226b284565282516b5217dc52f87ce8bb982a560

Fix for rB71271bb, was replacing the force vectors entirely instead of
adding.

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

M	source/blender/physics/intern/implicit_blender.c

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

diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c
index 960e88e..5f8f6ab 100644
--- a/source/blender/physics/intern/implicit_blender.c
+++ b/source/blender/physics/intern/implicit_blender.c
@@ -1451,16 +1451,18 @@ void BPH_mass_spring_force_face_wind(Implicit_Data *data, int v1, int v2, int v3
 void BPH_mass_spring_force_edge_wind(Implicit_Data *data, int v1, int v2, const float (*winvec)[3])
 {
 	const float effector_scale = 0.01;
-	float win[3], dir[3], length;
+	float win[3], dir[3], nor[3], length;
 	
 	sub_v3_v3v3(dir, data->X[v1], data->X[v2]);
 	length = normalize_v3(dir);
 	
 	direction_world_to_root(data, v1, win, winvec[v1]);
-	madd_v3_v3v3fl(data->F[v1], win, dir, -effector_scale * length * dot_v3v3(win, dir));
+	madd_v3_v3v3fl(nor, win, dir, -dot_v3v3(win, dir));
+	madd_v3_v3fl(data->F[v1], nor, effector_scale * length);
 	
 	direction_world_to_root(data, v2, win, winvec[v2]);
-	madd_v3_v3v3fl(data->F[v2], win, dir, -effector_scale * length * dot_v3v3(win, dir));
+	madd_v3_v3v3fl(nor, win, dir, -dot_v3v3(win, dir));
+	madd_v3_v3fl(data->F[v2], nor, effector_scale * length);
 }
 
 BLI_INLINE void dfdx_spring(float to[3][3], const float dir[3], float length, float L, float k)