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/generic/py_capi_utils.h
+++ b/source/blender/python/generic/py_capi_utils.h
@@ -106,6 +106,7 @@ bool PyC_RunString_AsString(const char *expr, const char *filename, char **r_val

 int PyC_ParseBool(PyObject *o, void *p);

+int PyC_CheckArgs_DeepCopy(PyObject *args);

 /* Integer parsing (with overflow checks), -1 on error. */
 int     PyC_Long_AsBool(PyObject *value);