[Bf-blender-cvs] [7335d66] alembic: Revert "Disabled the goal spring that is supposed to stabilize roots."

Lukas Tönne noreply at git.blender.org
Tue May 12 12:48:01 CEST 2015


Commit: 7335d6675e693521c45c447a591141cb052c320b
Author: Lukas Tönne
Date:   Tue May 12 12:47:03 2015 +0200
Branches: alembic
https://developer.blender.org/rB7335d6675e693521c45c447a591141cb052c320b

Revert "Disabled the goal spring that is supposed to stabilize roots."

This reverts commit 1b32ac9779c709918c3bf9d46e9e4bb1892dd8bc.

The goal spring is not working as intended, but is better than having
no bending force at the roots at all. Needs a better solution (virtual
root vertex).

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

M	source/blender/physics/intern/BPH_mass_spring.cpp

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

diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index f8f0a95..7b3c55a 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -1310,7 +1310,6 @@ static void strands_calc_curve_bending_forces(Strands *strands, float space[4][4
 //		mul_m3_m3m3(Mstate, rot, Mrest);
 	}
 	
-#if 0
 	{ /* apply force */
 		/* Note: applying forces to the first segment is necessary to equalize forces on the root,
 		 * otherwise energy gets introduced at the root and can destabilize the simulation.
@@ -1332,7 +1331,6 @@ static void strands_calc_curve_bending_forces(Strands *strands, float space[4][4
 		BPH_mass_spring_get_velocity(data, vroot, rootvel);
 		BPH_mass_spring_force_spring_goal(data, vj, goal, rootvel, stiffness, damping, NULL, NULL, NULL);
 	}
-#endif
 	
 	do {
 		float restlen = len_v3v3(it_bend.vertex1->co, it_bend.vertex0->co);




More information about the Bf-blender-cvs mailing list