[Bf-blender-cvs] [c84bd7f] gooseberry: Make random child length work again with the spiral kink mode.

[Lukas Tönne]

Commit: c84bd7fb0e2981e2a92e589b5487cbb1aac6cdcb
Author: Lukas Tönne
Date:   Wed Jan 14 10:08:45 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBc84bd7fb0e2981e2a92e589b5487cbb1aac6cdcb

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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs