godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18587 from AlexHoratio/master 

Defaults to instancing child at tree root when none selected
This commit is contained in:
Max Hilbrunner 2018-05-07 09:28:49 +02:00 committed by GitHub
parent 91428b8cae cdcfb9582e
commit 9b0c487dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/scene_tree_dock.cpp
View File

@ -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 :("));