diff options
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index a18c9cf3712..8a0e48e3412 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1947,11 +1947,10 @@ 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_EVAL_CTX(eval_ctx) \ - (((eval_ctx)->object_mode & OB_MODE_EDIT) ? OBACT((eval_ctx)->view_layer) : NULL) - -#define OBEDIT_FROM_WINDOW(window) \ - BKE_workspace_edit_object(WM_window_get_active_workspace(window), WM_window_get_active_scene(window)) +#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)) #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) |