diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 15:04:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 15:04:19 +0300 |
| commit | 35bd1bb957b3c7491875d58d0092eab39c3b4e0e (patch) | |
| tree | b4e29938a9f1988413ec311506ebb2f0805865c3 /source/blender/editors/screen/workspace_edit.c | |
| parent | 437801bec1f4140b255927e6e6c957fa5b453014 (diff) | |
WorkSpace: move edit mode w/ sync into own func
Diffstat (limited to 'source/blender/editors/screen/workspace_edit.c')
| -rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 7635a2644f5..23715f667fe 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -221,19 +221,12 @@ bool ED_workspace_change( WM_toolsystem_unlink(C, workspace_old); WM_toolsystem_link(C, workspace_new); - if (obact_new == NULL) { - workspace_new->object_mode = OB_MODE_OBJECT; + if (use_object_mode) { + ED_object_mode_generic_enter_or_other_window(C, workspace_new->object_mode); } - else if (use_object_mode) { - eObjectMode object_mode_set = workspace_new->object_mode; - if (ED_workspace_object_mode_in_other_window( - bmain->wm.first, win, obact_new, &object_mode_set)) - { - workspace_new->object_mode = object_mode_set; - } - else { + else { + if (obact_new == NULL) { workspace_new->object_mode = OB_MODE_OBJECT; - ED_object_mode_generic_enter(C, object_mode_set); } } |