diff options
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 5 | ||||
| m--------- | source/tools | 0 |
4 files changed, 5 insertions, 0 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject ad39a4b8961e2afb852852e2e3057bc3a770d2e +Subproject 6f0128c332290c6f3639d4d949d3e06bfaa7102 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject ee92205e9687eabb0ef91d8c437014ac720126e +Subproject 5c4210d5b78c61137c5f32e7deb7561177ac089 diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index df20dbd8055..b644457e593 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -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); } } diff --git a/source/tools b/source/tools -Subproject 5162393c104d6d5f0314183a084875fff68f28b +Subproject 30d4611eacb1c5b27a5e9d2432cb12843054abc |