r34526 removed a line which had an unused return value but still needed to run.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 27 Jan 2011 12:36:48 +0000 (12:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 27 Jan 2011 12:36:48 +0000 (12:36 +0000)
doc/python_api/sphinx_doc_gen.sh
source/blender/blenkernel/intern/particle.c

index ae7fad58c234b4dc6482a3755e517faade91028b..90116b434142ddbecdb115826afdecd891e9e50b 100755 (executable)
@@ -20,7 +20,7 @@ SSH_UPLOAD_FULL=$SSH_UPLOAD/"blender_python_api_"$BLENDER_VERSION
 SPHINXBASE=doc/python_api/
 
 # dont delete existing docs, now partial updates are used for quick builds.
-$BLENDER --background --python $SPHINXBASE/sphinx_doc_gen.py
+$BLENDER --background --factory-startup --python $SPHINXBASE/sphinx_doc_gen.py
 
 # html
 sphinx-build $SPHINXBASE/sphinx-in $SPHINXBASE/sphinx-out
index 492b78f7365aa217bd7274dc2a618889756dac9f..11ea82803eb520e84a989d0d128083fe75cee68b 100644 (file)
@@ -1970,6 +1970,7 @@ static void do_kink(ParticleKey *state, ParticleKey *par, float *par_rot, float
                }
                
                mul_v3_fl(par_vec, -1.f);
+               normalize_v3_v3(vec_one, par_vec);
 
                inp_y=dot_v3v3(y_vec, vec_one);
                inp_z=dot_v3v3(z_vec, vec_one);