diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 12:35:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 12:55:12 +0300 |
| commit | c8597a465f22e020b1c0ce6fcfbb7b7308efdad1 (patch) | |
| tree | bdff87671b2f24ce7f393534e4325fb9e66eeda8 /source/blender/editors/screen/screen_context.c | |
| parent | 754d3a2fe626fbe57bb6ef47581368e3859f6390 (diff) | |
Object Mode: remove Scene.obedit
Add ED_screen_window_find, BKE_workspace_edit_object
Diffstat (limited to 'source/blender/editors/screen/screen_context.c')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index bb92ea35ad0..2a48ae46b12 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -92,8 +92,8 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult Scene *scene = WM_window_get_active_scene(win); WorkSpace *workspace = BKE_workspace_active_get(win->workspace_hook); ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace); - Object *obedit = scene->obedit; Object *obact = (view_layer && view_layer->basact) ? view_layer->basact->object : NULL; + Object *obedit = BKE_workspace_edit_object(workspace, scene); if (CTX_data_dir(member)) { CTX_data_dir_set(result, screen_context_dir); |