diff options
| author | Max Hilbrunner | 2018-05-07 09:28:49 +0200 |
|---|---|---|
| committer | GitHub | 2018-05-07 09:28:49 +0200 |
| commit | 9b0c487dd43116f16848146f1ea0904eae1ae888 (patch) | |
| tree | f72f60cceaac53b07d7a1ec1e3ecb5fe9fe0c208 | |
| parent | 91428b8cae201cef5d6dafee6a4d4839d1d8d67b (diff) | |
| parent | cdcfb9582e6e9f18df1475619f2ebe62b7f0bdce (diff) | |
| download | godot-9b0c487dd43116f16848146f1ea0904eae1ae888.tar.gz godot-9b0c487dd43116f16848146f1ea0904eae1ae888.tar.zst godot-9b0c487dd43116f16848146f1ea0904eae1ae888.zip | |
Merge pull request #18587 from AlexHoratio/master
Defaults to instancing child at tree root when none selected
| -rw-r--r-- | editor/scene_tree_dock.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 38027a34a..ba661813d 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 :(")); |