diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-06 19:15:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-06 19:15:51 +0300 |
| commit | 6b2cf4e86effb4ba40dc093c85eb590b3040d66a (patch) | |
| tree | 16974bb6d1cf594442149ad228184128d28562c9 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 4e52724aa8ec18a97eaf9348cf82db5ad951f90a (diff) | |
Delete object crashed (missing NULL check)
Error in recent removal of workspace.object_mode
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 8a0e48e3412..441d67f7b5c 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -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) |