svn merge ^/trunk/blender -r40890:40950

2011-10-14 01:35:20 +00:00
parent 7eadd540d4 be24b4dfcc
commit 4e118bb22f
121 changed files with 956 additions and 814 deletions
--- a/source/blender/python/mathutils/mathutils_Quaternion.c
+++ b/source/blender/python/mathutils/mathutils_Quaternion.c
@@ -193,7 +193,7 @@ static PyObject *Quaternion_dot(QuaternionObject *self, PyObject *value)
 }

 PyDoc_STRVAR(Quaternion_rotation_difference_doc,
-".. function:: difference(other)\n"
+".. function:: rotation_difference(other)\n"
 "\n"
 "   Returns a quaternion representing the rotational difference.\n"
 "\n"