[Bf-blender-cvs] [2c82e74] master: Fix for hair child roughness.

[Lukas Tönne]

Commit: 2c82e748c1eaa25a8a5202c8360d8073d4a81c6f
Author: Lukas Tönne
Date:   Mon Feb 2 14:46:48 2015 +0100
Branches: master
https://developer.blender.org/rB2c82e748c1eaa25a8a5202c8360d8073d4a81c6f

Fix for hair child roughness.

The fixed-function roughness was not getting used once the curve
roughness has been enabled at least once.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c
index 24fba60..33541c3 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -704,7 +704,7 @@ void do_child_modifiers(ParticleSimulationData *sim, ParticleTexture *ptex, cons
 		}
 	}
 
-	if (part->roughcurve) {
+	if (roughcurve) {
 		do_rough_curve(orco, mat, t, rough1, part->rough1_size, roughcurve, state);
 	}
 	else {