Browse Source

Merge pull request #2894 from neikeq/import_subscene_patch

Import Sub-Scene as root's child if no node is selected
Rémi Verschelde 9 years ago
parent
commit
17a97b7bdf
1 changed files with 4 additions and 1 deletions
  1. 4 1
      tools/editor/scene_tree_dock.cpp

+ 4 - 1
tools/editor/scene_tree_dock.cpp

@@ -1264,7 +1264,10 @@ void SceneTreeDock::import_subscene() {
 void SceneTreeDock::_import_subscene() {
 
 	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);
 	editor_data->get_undo_redo().clear_history(); //no undo for now..