archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-08-01 09:01:29 +10:00
parent 29937dce8f 6a39d72558
commit 0f449541d2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/generic/imbuf_py_api.h
View File

@@ -27,4 +27,6 @@
PyObject *BPyInit_imbuf(void); PyObject *BPyInit_imbuf(void);
extern PyTypeObject Py_ImBuf_Type;
#endif /* __IMBUF_PY_API_H__ */ #endif /* __IMBUF_PY_API_H__ */

2
source/blender/python/intern/bpy_driver.c
View File

@@ -254,7 +254,7 @@ static void pydriver_error(ChannelDriver *driver)
#define OK_OP(op) [op] = 1 #define OK_OP(op) [op] = 1
const char secure_opcodes[255] = { static const char secure_opcodes[255] = {
OK_OP(POP_TOP), OK_OP(POP_TOP),
OK_OP(ROT_TWO), OK_OP(ROT_TWO),
OK_OP(ROT_THREE), OK_OP(ROT_THREE),