Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2015-02-02 16:46:48 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-02-02 16:47:50 +0300
commit2c82e748c1eaa25a8a5202c8360d8073d4a81c6f (patch)
treed4da8f40a8ae9484cced1557b81a6951ee032ff5 /source/blender
parent750506be97655044d4746ab2b1ef58408e3f7794 (diff)
Fix for hair child roughness.
The fixed-function roughness was not getting used once the curve roughness has been enabled at least once.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/particle_child.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c
index 24fba604d1e..33541c3a7fd 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 {