Merge branch 'master' into blender2.8

2017-09-19 21:08:14 +05:00
parent 2cdc2f2a25 b31faac17e
commit af170839af
45 changed files with 336 additions and 152 deletions
--- a/source/blender/python/generic/py_capi_utils.h
+++ b/source/blender/python/generic/py_capi_utils.h
@@ -28,7 +28,7 @@
 #define __PY_CAPI_UTILS_H__

 #include "BLI_sys_types.h"
-#include "BLI_variadic_defines.h"
+#include "BLI_utildefines_variadic.h"

 void			PyC_ObSpit(const char *name, PyObject *var);
 void			PyC_LineSpit(void);