sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T58022: Changing workspace may change layout of User Pref window

Browse Source 
Logic to update child windows on workspace changes should simply ignore
temporary child windows. Users opened those for a specific purpose (i.e. edit
user preferences or show render result). Blender should not come in and
repurpose it.
This commit is contained in:
Julian Eisel 2018-11-24 19:20:31 +01:00
parent 0c8b0771f2
commit 23d66c5d60
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit ad39a4b8961e2afb852852e2e3057bc3a770d2ee
Subproject commit 6f0128c332290c6f3639d4d949d3e06bfaa71022

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit ee92205e9687eabb0ef91d8c437014ac720126ea
Subproject commit 5c4210d5b78c61137c5f32e7deb7561177ac0894

5
source/blender/windowmanager/intern/wm_window.c
View File

@ -2230,6 +2230,11 @@ void WM_window_set_active_workspace(bContext *C, wmWindow *win, WorkSpace *works
for (wmWindow *win_child = wm->windows.first; win_child; win_child = win_child->next) {
if (win_child->parent == win_parent) {
bScreen *screen = WM_window_get_active_screen(win_child);
/* Don't change temporary screens, they only serve a single purpose. */
if (screen->temp) {
continue;
}
ED_workspace_change(workspace, C, wm, win_child);
}
}

2
source/tools

@ -1 +1 @@
Subproject commit 5162393c104d6d5f0314183a084875fff68f28bb
Subproject commit 30d4611eacb1c5b27a5e9d2432cb12843054abc9