Merge branch 'master' into blender2.8

Conflicts: source/blender/blenkernel/intern/collision.c
2018-09-03 17:44:36 +02:00
parent b46e987a70 265ec400ab
commit a43ebc63fa
73 changed files with 140 additions and 140 deletions
--- a/source/blender/python/mathutils/mathutils.h
+++ b/source/blender/python/mathutils/mathutils.h
@@ -170,7 +170,7 @@ Py_hash_t mathutils_array_hash(const float *float_array, size_t array_len);
 int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject *mat);

 #ifndef MATH_STANDALONE
-/* dynstr as python string utility funcions */
+/* dynstr as python string utility functions */
 PyObject *mathutils_dynstr_to_py(struct DynStr *ds);
 #endif