[Bf-blender-cvs] [15490d4] gooseberry: Spiral rotation axis was not always fully normalized, avoid an assert.
Lukas Tönne
noreply at git.blender.org
Wed Jan 14 12:30:01 CET 2015
Commit: 15490d4685a81d78f565e1c6e531757ee81943c7
Author: Lukas Tönne
Date: Wed Jan 14 11:48:51 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB15490d4685a81d78f565e1c6e531757ee81943c7
Spiral rotation axis was not always fully normalized, avoid an assert.
===================================================================
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 16e8869..e26a61f 100644
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@ -153,6 +153,7 @@ static void do_kink_spiral_deform(ParticleKey *state, const float dir[3], const
theta = -theta;
cross_v3_v3v3(spiral_axis, dir, kink);
+ normalize_v3(spiral_axis);
mul_v3_v3fl(vec, kink, -radius);
More information about the Bf-blender-cvs
mailing list