summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Hilbrunner <mhilbrunner@users.noreply.github.com>2018-05-07 09:28:49 +0200
committerGitHub <noreply@github.com>2018-05-07 09:28:49 +0200
commit9b0c487dd43116f16848146f1ea0904eae1ae888 (patch)
treef72f60cceaac53b07d7a1ec1e3ecb5fe9fe0c208
parent91428b8cae201cef5d6dafee6a4d4839d1d8d67b (diff)
parentcdcfb9582e6e9f18df1475619f2ebe62b7f0bdce (diff)
Merge pull request #18587 from AlexHoratio/master
Defaults to instancing child at tree root when none selected
-rw-r--r--editor/scene_tree_dock.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 38027a34a7..ba661813d6 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -107,7 +107,12 @@ void SceneTreeDock::_unhandled_key_input(Ref<InputEvent> p_event) {
void SceneTreeDock::instance(const String &p_file) {
Node *parent = scene_tree->get_selected();
- if (!parent || !edited_scene) {
+
+ if (!parent) {
+ Node *parent = edited_scene;
+ };
+
+ if (!edited_scene) {
current_option = -1;
accept->get_ok()->set_text(TTR("OK :("));