Merge branch 'master' into blender2.8

2018-06-26 09:34:13 +02:00
parent e6825946d0 df237b964b
commit ea339dc62c
18 changed files with 73 additions and 16 deletions
--- a/source/blender/python/mathutils/mathutils.h
+++ b/source/blender/python/mathutils/mathutils.h
@@ -174,6 +174,4 @@ int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject
 PyObject *mathutils_dynstr_to_py(struct DynStr *ds);
 #endif

-int mathutils_deepcopy_args_check(PyObject *args);
-
 #endif /* __MATHUTILS_H__ */