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-01-14 12:08:45 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-20 11:30:11 +0300
commitdcfa75bc89363971c3638780682f05021f7f00cc (patch)
tree2990f67731d56a1d8f60f32b86c8c69c6334b272 /source/blender/blenkernel/intern/particle_child.c
parentc2a7f26cbc4306705be875fab33cba1814cb6a0c (diff)
Make random child length work again with the spiral kink mode.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_child.c')
-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 358e34e3f78..16e8869d7cf 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;