From 4a2b64e43d30a58de7f6d677ea43ffbd656265c7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Apr 2018 18:17:18 +0200 Subject: [PATCH] Minor change to last commit --- source/blender/makesdna/DNA_scene_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 441d67f7b5c..3575ad976a5 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1948,9 +1948,9 @@ extern const char *RE_engine_id_CYCLES; #define OBEDIT_FROM_WORKSPACE(workspace, _view_layer) \ (((workspace)->object_mode & OD_MODE_EDIT) ? OBACT(_view_layer) : NULL) #define OBEDIT_FROM_OBACT(ob) \ - (((ob)->mode & OB_MODE_EDIT) ? ob : NULL) + ((ob) ? (((ob)->mode & OB_MODE_EDIT) ? ob : NULL) : NULL) #define OBEDIT_FROM_VIEW_LAYER(view_layer) \ - OBEDIT_FROM_OBACT(OBACT(view_layer) ? OBACT(view_layer) : NULL) + OBEDIT_FROM_OBACT(OBACT(view_layer)) #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)