diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-10 10:38:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 10:38:22 +0200 |
| commit | abae0757ac41a2da838adcab26c4c980f31c9461 (patch) | |
| tree | d30f7bf68fdff83cb683c05715b6ac053cee84a3 /editor/scene_tree_dock.cpp | |
| parent | 60db9f906c8572f46bede89b5ed68965d660713a (diff) | |
| parent | f30e4dbf54397646a81b45ab64978e22d4a5c8d9 (diff) | |
Merge pull request #39424 from YeldhamDev/scene_root_select
Fix scene tree showing up when the root selection is present
Diffstat (limited to 'editor/scene_tree_dock.cpp')
| -rw-r--r-- | editor/scene_tree_dock.cpp | 4 |
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(); } |