summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Alexsander <michaelalexsander@protonmail.com>2020-06-09 19:06:15 -0300
committerMichael Alexsander <michaelalexsander@protonmail.com>2020-06-09 19:06:15 -0300
commitf30e4dbf54397646a81b45ab64978e22d4a5c8d9 (patch)
tree0783f625e26743f5efaa31f7a15bdf628d6acb08
parentae21b5ddad844b92d055dd77dca5ce84d56b9719 (diff)
Fix scene tree showing up when the root selection is present
-rw-r--r--editor/scene_tree_dock.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index c37d32b26b..5795d85e66 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -2658,7 +2658,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();
}