diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/editors/screen/workspace_edit.c | |
parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'source/blender/editors/screen/workspace_edit.c')
-rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 34def82f16e..00a965beae7 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -239,7 +239,7 @@ WorkSpace *ED_workspace_duplicate( * \return if succeeded. */ bool ED_workspace_delete( - WorkSpace *workspace, Main *bmain, bContext *C, wmWindowManager *wm, wmWindow *win) + WorkSpace *workspace, Main *bmain, bContext *C, wmWindowManager *wm) { ID *workspace_id = (ID *)workspace; @@ -247,7 +247,7 @@ bool ED_workspace_delete( return false; } - if (WM_window_get_active_workspace(win) == workspace) { + for (wmWindow *win = wm->windows.first; win; win = win->next) { WorkSpace *prev = workspace_id->prev; WorkSpace *next = workspace_id->next; @@ -315,7 +315,7 @@ static int workspace_delete_exec(bContext *C, wmOperator *UNUSED(op)) wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win = CTX_wm_window(C); - ED_workspace_delete(WM_window_get_active_workspace(win), bmain, C, wm, win); + ED_workspace_delete(WM_window_get_active_workspace(win), bmain, C, wm); return OPERATOR_FINISHED; } |