Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-29 15:42:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source
This commit is contained in:
Juan Linietsky 2015-03-31 17:57:43 -03:00
commit 33f24df786
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/editor/scene_tree_dock.cpp
View File

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