Fix for applying the bending randomness factor.

A stupid hack is needed here, changing the way the factor is applied to
angular bending springs. In cloth sim the bending factor of individual
springs is applied as a mix value between the bending stiffness and a
max value, but this max value isn't even used in hair sim so that
approach becomes useless.

Conflicts:
	source/blender/physics/intern/BPH_mass_spring.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index b59a80ddbcc..cb30529870f 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -398,7 +398,11 @@ BLI_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s,
 		

 		s->flags |= CLOTH_SPRING_FLAG_NEEDED;

 		

-		scaling = parms->bending + s->stiffness * fabsf(parms->max_bend - parms->bending);

+		/* XXX WARNING: angular bending springs for hair apply stiffness factor as an overall factor, unlike cloth springs!

+		 * this is crap, but needed due to cloth/hair mixing ...

+		 * max_bend factor is not even used for hair, so ...

+		 */

+		scaling = s->stiffness * parms->bending;

 		kb = scaling / (20.0f * (parms->avg_spring_len + FLT_EPSILON));

 		

 		scaling = parms->bending_damping;