diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 09:23:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 09:23:07 +0300 |
| commit | e77b4a30c05a95781deade1163b5c2f37643a920 (patch) | |
| tree | 0cba1e2e0f24e0219a05db2a0454cc53182445ca /source/blender/makesdna | |
| parent | 147c24aeeb96a8ea5128c1593a10dc3db4ce8f7e (diff) | |
Initial removal of Scene.obedit
First pass, some issues remain
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 671ad1bc954..e7f0ad9d3db 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1623,7 +1623,8 @@ typedef struct Scene { ListBase base DNA_DEPRECATED; struct Base *basact DNA_DEPRECATED; /* active base */ - struct Object *obedit; /* name replaces old G.obedit */ + + struct Editing *ed; /* sequence editor data is allocated here */ float cursor[3]; /* 3d cursor location */ char _pad[4]; @@ -1639,10 +1640,7 @@ typedef struct Scene { struct bNodeTree *nodetree; - struct Editing *ed; /* sequence editor data is allocated here */ - struct ToolSettings *toolsettings; /* default allocated now */ - void *pad2; struct DisplaySafeAreas safe_areas; /* migrate or replace? depends on some internal things... */ @@ -1944,6 +1942,14 @@ extern const char *RE_engine_id_CYCLES; #define BASACT(_view_layer) ((_view_layer)->basact) #define OBACT(_view_layer) (BASACT(_view_layer) ? BASACT(_view_layer)->object: NULL) +#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 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) |