Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 23:01:29 +0000 (09:01 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 Jul 2018 23:01:29 +0000 (09:01 +1000)
source/blender/python/generic/imbuf_py_api.h
source/blender/python/intern/bpy_driver.c

index 92c1732a9c995d30de2ab8d656e87f98f6b346b0..35adc541bfc2e6ddcca1e61e75bf52037f9b272b 100644 (file)
@@ -27,4 +27,6 @@
 
 PyObject *BPyInit_imbuf(void);
 
+extern PyTypeObject Py_ImBuf_Type;
+
 #endif  /* __IMBUF_PY_API_H__ */
index d3464ea58412140ee6e9376c30f3ad12be769eb1..a94708c06028ed25a372584cfebb345e29789dda 100644 (file)
@@ -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),