Merged changes in the trunk up to revision 52191.

Conflicts resolved: source/blender/makesdna/DNA_scene_types.h
2012-11-14 02:01:02 +00:00
parent 872af48183 de5d0d649d
commit 6cee7bb2b7
115 changed files with 1964 additions and 646 deletions
--- a/source/blender/python/mathutils/mathutils_Vector.c
+++ b/source/blender/python/mathutils/mathutils_Vector.c
@@ -2784,7 +2784,7 @@ static struct PyMethodDef Vector_methods[] = {
 /* Note
 * Py_TPFLAGS_CHECKTYPES allows us to avoid casting all types to Vector when coercing
 * but this means for eg that
- * (vec * mat) and (mat * vec) both get sent to Vector_mul and it neesd to sort out the order
+ * (vec * mat) and (mat * vec) both get sent to Vector_mul and it needs to sort out the order
 */

 PyDoc_STRVAR(vector_doc,