blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Delete object crashed (missing NULL check) 

Error in recent removal of workspace.object_mode
This commit is contained in:
Campbell Barton 2018-04-06 18:15:39 +02:00
parent 4e52724aa8
commit 6b2cf4e86e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesdna/DNA_scene_types.h
View File

@ -1950,7 +1950,7 @@ extern const char *RE_engine_id_CYCLES;
#define OBEDIT_FROM_OBACT(ob) \
(((ob)->mode & OB_MODE_EDIT) ? ob : NULL)
#define OBEDIT_FROM_VIEW_LAYER(view_layer) \
OBEDIT_FROM_OBACT(OBACT(view_layer))
OBEDIT_FROM_OBACT(OBACT(view_layer) ? OBACT(view_layer) : NULL)
#define V3D_CAMERA_LOCAL(v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : NULL)
#define V3D_CAMERA_SCENE(scene, v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : (scene)->camera)