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

Merge pull request #2894 from neikeq/import_subscene_patch

Browse Source 
Import Sub-Scene as root's child if no node is selected
This commit is contained in:
Rémi Verschelde 2015-11-23 20:27:51 +01:00
commit 17a97b7bdf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/scene_tree_dock.cpp
View File

@ -1264,7 +1264,10 @@ void SceneTreeDock::import_subscene() {
void SceneTreeDock::_import_subscene() { void SceneTreeDock::_import_subscene() {
Node* parent = scene_tree->get_selected(); Node* parent = scene_tree->get_selected();
ERR_FAIL_COND(!parent); if (!parent) {
parent = editor_data->get_edited_scene_root();
ERR_FAIL_COND(!parent);
}
import_subscene_dialog->move(parent,edited_scene); import_subscene_dialog->move(parent,edited_scene);
editor_data->get_undo_redo().clear_history(); //no undo for now.. editor_data->get_undo_redo().clear_history(); //no undo for now..