asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

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 (edited_scene) {
// If root exists in edited scene
parent = scene_tree->get_selected(); parent = scene_tree->get_selected();
ERR_FAIL_COND(!parent); if( !parent )
} else { parent = edited_scene;
} else {
// If no root exist in edited scene
parent = scene_root; parent = scene_root;
ERR_FAIL_COND(!parent); ERR_FAIL_COND(!parent);
} }
Object *c = create_dialog->instance_selected(); Object *c = create_dialog->instance_selected();