[Bf-blender-cvs] [6e336d4] temp_merge_gooseberry_hair: Make random child length work again with the spiral kink mode.
Lukas Tönne
noreply at git.blender.org
Mon Jan 19 20:51:58 CET 2015
Commit: 6e336d416b328fc8eafc362b22a4ecea044f28aa
Author: Lukas Tönne
Date: Wed Jan 14 10:08:45 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB6e336d416b328fc8eafc362b22a4ecea044f28aa
Make random child length work again with the spiral kink mode.
===================================================================
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 358e34e..16e8869 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -213,7 +213,7 @@ static void do_kink_spiral(ParticleThreadContext *ctx, ParticleTexture *ptex, co
for (k = 0, key = keys; k < totkeys-1; k++, key++)
totlen += len_v3v3((key+1)->co, key->co);
- cutlen = totlen - fabsf(kink_amp);
+ cutlen = max_ff(ptex->length * totlen - fabsf(kink_amp), 0.0f);
zero_v3(spiral_start);
len = 0.0f;
More information about the Bf-blender-cvs
mailing list