Randomness factor for hair bending stiffness.

This helps to create some variation in a hair system, which can
otherwise become very uniform and boring. It's yet another confusing
setting in a system that should have been nodified, but only option for
now (broken windows ...)

Conflicts:
	source/blender/blenkernel/intern/particle_system.c
	source/blender/physics/intern/BPH_mass_spring.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 67b2aec7863..b59a80ddbcc 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -114,11 +114,11 @@ void BKE_cloth_solver_set_positions(ClothModifierData *clmd)
 	Cloth *cloth = clmd->clothObject;

 	ClothVertex *verts = cloth->verts;

 	unsigned int numverts = cloth->numverts, i;

-	ClothHairRoot *cloth_roots = clmd->roots;

+	ClothHairData *cloth_hairdata = clmd->hairdata;

 	Implicit_Data *id = cloth->implicit;

 	

 	for (i = 0; i < numverts; i++) {

-		ClothHairRoot *root = &cloth_roots[i];

+		ClothHairData *root = &cloth_hairdata[i];

 		

 		BPH_mass_spring_set_rest_transform(id, i, root->rot);

 		BPH_mass_spring_set_motion_state(id, i, verts[i].x, verts[i].v);