diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-27 15:36:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-27 15:36:48 +0300 |
commit | ce7f7d6e5fe98ab6fc1a7bfee3635851dce48421 (patch) | |
tree | a813c503d002fca9819ea2a0ea1e42ef02b47fca | |
parent | 8fa9a916395652cab6c4fcebb17be677fd6091d1 (diff) |
r34526 removed a line which had an unused return value but still needed to run.
-rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index ae7fad58c23..90116b43414 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -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 diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 492b78f7365..11ea82803eb 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -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); |