From 23d66c5d609ad9d113214ab0ec99668dded35ac3 Mon Sep 17 00:00:00 2001
From: Julian Eisel <eiseljulian@gmail.com>
Date: Sat, 24 Nov 2018 19:20:31 +0100
Subject: [PATCH] Fix T58022: Changing workspace may change layout of User Pref
 window

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.
---
 release/scripts/addons                          | 2 +-
 release/scripts/addons_contrib                  | 2 +-
 source/blender/windowmanager/intern/wm_window.c | 5 +++++
 source/tools                                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/release/scripts/addons b/release/scripts/addons
index ad39a4b8961..6f0128c3322 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit ad39a4b8961e2afb852852e2e3057bc3a770d2ee
+Subproject commit 6f0128c332290c6f3639d4d949d3e06bfaa71022
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index ee92205e968..5c4210d5b78 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit ee92205e9687eabb0ef91d8c437014ac720126ea
+Subproject commit 5c4210d5b78c61137c5f32e7deb7561177ac0894
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
index 5162393c104..30d4611eacb 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 5162393c104d6d5f0314183a084875fff68f28bb
+Subproject commit 30d4611eacb1c5b27a5e9d2432cb12843054abc9