diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-01 02:01:29 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-01 02:01:29 +0300 |
commit | 0f449541d2e5ad0f7814c3f9254fa486029aaa92 (patch) | |
tree | e4c457ca60efba07e3024881c4ab63c8334fc273 /source | |
parent | 29937dce8f518b09838f58abcc42a43fb29bf64f (diff) | |
parent | 6a39d7255848511f231085bfb70c7daea8f0ca59 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/python/generic/imbuf_py_api.h | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_driver.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/python/generic/imbuf_py_api.h b/source/blender/python/generic/imbuf_py_api.h index 92c1732a9c9..35adc541bfc 100644 --- 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__ */ diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index d3464ea5841..a94708c0602 100644 --- 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), |