[Bf-blender-cvs] [cd37234] temp_merge_gooseberry_hair: Spiral rotation axis was not always fully normalized, avoid an assert.

[Lukas Tönne]

Commit: cd37234137c252af55246eda99c13430b4481784
Author: Lukas Tönne
Date:   Wed Jan 14 11:48:51 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rBcd37234137c252af55246eda99c13430b4481784

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);