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

Merge pull request #47611 from Bhu1-V/PR/instance-scene-fix

This commit is contained in:
Rémi Verschelde 2021-04-19 10:38:56 +02:00 committed by GitHub
parent 698c7d26f9 9eb3546f38
commit f41e7779fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/scene_tree_dock.cpp
View File

@ -140,7 +140,11 @@ void SceneTreeDock::instance_scenes(const Vector<String> &p_files, Node *p_paren
parent = scene_tree->get_selected(); parent = scene_tree->get_selected();
} }
if (!parent || !edited_scene) { if (!parent) {
parent = edited_scene;
}
if (!parent) {
if (p_files.size() == 1) { if (p_files.size() == 1) {
accept->set_text(TTR("No parent to instance a child at.")); accept->set_text(TTR("No parent to instance a child at."));
} else { } else {