Merge branch 'master' into blender2.8

2018-08-01 09:01:29 +10:00
parent 29937dce8f 6a39d72558
commit 0f449541d2
2 changed files with 3 additions and 1 deletions
--- a/source/blender/python/generic/imbuf_py_api.h
+++ b/source/blender/python/generic/imbuf_py_api.h
@@ -27,4 +27,6 @@

 PyObject *BPyInit_imbuf(void);

+extern PyTypeObject Py_ImBuf_Type;
+
 #endif  /* __IMBUF_PY_API_H__ */
--- a/source/blender/python/intern/bpy_driver.c
+++ b/source/blender/python/intern/bpy_driver.c
@@ -254,7 +254,7 @@ static void pydriver_error(ChannelDriver *driver)

 #define OK_OP(op) [op] = 1

-const char secure_opcodes[255] = {
+static const char secure_opcodes[255] = {
 	OK_OP(POP_TOP),
 	OK_OP(ROT_TWO),
 	OK_OP(ROT_THREE),