blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-08-01 09:01:29 +10:00
parent 29937dce8f 6a39d72558
commit 0f449541d2
Notes: blender-bot 2023-02-14 05:33:52 +01:00 
Referenced by issue #56340, crash when clicking on Transform, Grab, Rotate, or Scale icon button on the left tool bar
Referenced by issue #56278, Blender 2.8 selection inconsistent between mouse and pen.
Referenced by issue #56238, Key A shortcut don't work
Referenced by issue #56203, Blender 2.8 - Appending objects from 2.79 don´t appear in collections, only on viewport.
Referenced by issue #56207, Blender 2.8 - Principled hair shader is not working on shade more or render mode (eevee)
Referenced by issue #56193, Blender 2.8 crash on startup, but starts with -d --debug-gpu
Referenced by issue #56198, Crash from flipping lighting MatCap in properties editor
Referenced by issue #56185, Changing color of material of grease pencil crashes blender 2.8
Referenced by issue #56187, click+drag on grease pencil in edit/sculpt/weight paint mode with cursor
Referenced by issue #55998, Blender 2.8 Crashes on accent use (Latin Characters)
2 changed files with 3 additions and 1 deletions
Show Stats 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);
extern PyTypeObject Py_ImBuf_Type;
#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
const char secure_opcodes[255] = {
static const char secure_opcodes[255] = {
OK_OP(POP_TOP),
OK_OP(ROT_TWO),
OK_OP(ROT_THREE),