From 5495bbdd470581458e79d77be6f9a66cec2bcbf6 Mon Sep 17 00:00:00 2001
From: Michael Alexsander <michaelalexsander@protonmail.com>
Date: Tue, 9 Jun 2020 19:06:15 -0300
Subject: [PATCH] Fix scene tree showing up when the root selection is present

(cherry picked from commit f30e4dbf54397646a81b45ab64978e22d4a5c8d9)
---
 editor/scene_tree_dock.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index b2f290e435f..e0326c77e48 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -2696,7 +2696,9 @@ void SceneTreeDock::_remote_tree_selected() {
 
 void SceneTreeDock::_local_tree_selected() {
 
-	scene_tree->show();
+	if (!bool(EDITOR_GET("interface/editors/show_scene_tree_root_selection")) || get_tree()->get_edited_scene_root() != nullptr) {
+		scene_tree->show();
+	}
 	if (remote_tree)
 		remote_tree->hide();
 	edit_remote->set_pressed(false);