diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-03-31 15:38:50 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-03-31 15:38:50 -0300 |
commit | 4883e2e887ca9ab6b939482c9889271cae3b047a (patch) | |
tree | 0c76d2aace50f3b09519830f6232bf24bddd7fda | |
parent | ad634876b5b7d775f6d490cf7f874c6aae058a28 (diff) | |
parent | 3d4cc27bad8fe05f38488c52ef6bb4c846993209 (diff) |
Merge pull request #1589 from MostafaHassan/pr_NoSelection_AddNodeToRoot
New node will be added to root node if nothing is selected
-rw-r--r-- | tools/editor/scene_tree_dock.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 2012d96664..84b34cf130 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1059,14 +1059,15 @@ void SceneTreeDock::_create() { if (edited_scene) { - + // If root exists in edited scene parent = scene_tree->get_selected(); - ERR_FAIL_COND(!parent); - } else { + if( !parent ) + parent = edited_scene; + } else { + // If no root exist in edited scene parent = scene_root; ERR_FAIL_COND(!parent); - } Object *c = create_dialog->instance_selected(); |