archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix active workspace changes when deleting workspace

Browse Source 
Tested for multi-window as well, which failed with the previous code even
before we introduced ordered workspaces.
This commit is contained in:
Dalai Felinto
2019-03-08 18:48:27 -03:00
parent aa49444c29
commit a0f2923fd8
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/screen/workspace_edit.c
View File

@@ -221,20 +221,31 @@ WorkSpace *ED_workspace_duplicate(
bool ED_workspace_delete(
WorkSpace *workspace, Main *bmain, bContext *C, wmWindowManager *wm)
{
ID *workspace_id = (ID *)workspace;
if (BLI_listbase_is_single(&bmain->workspaces)) {
return false;
}
for (wmWindow *win = wm->windows.first; win; win = win->next) {
WorkSpace *prev = workspace_id->prev;
WorkSpace *next = workspace_id->next;
ED_workspace_change((prev != NULL) ? prev : next, C, wm, win);
ListBase ordered;
BKE_id_ordered_list(&ordered, &bmain->workspaces);
WorkSpace *prev = NULL, *next = NULL;
for (LinkData *link = ordered.first; link; link = link->next) {
if (link->data == workspace) {
prev = link->prev ? link->prev->data : NULL;
next = link->next ? link->next->data : NULL;
break;
}
}
BKE_id_free(bmain, workspace_id);
BLI_freelistN(&ordered);
BLI_assert((prev != NULL) || (next != NULL));
for (wmWindow *win = wm->windows.first; win; win = win->next) {
WorkSpace *workspace_active = WM_window_get_active_workspace(win);
if (workspace_active == workspace) {
ED_workspace_change((prev != NULL) ? prev : next, C, wm, win);
}
}
BKE_id_free(bmain, &workspace->id);
return true;
}