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

Fixed a bug where if a scene hadn't been saved it would find a cyclical dependency.

Browse source
This commit is contained in:
Nathan Warden 2015-01-20 09:05:22 -05:00
parent 92cc7b840e
commit 0e8987abaf
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/editor/scene_tree_dock.cpp
View file

@ -83,12 +83,16 @@ Node* SceneTreeDock::instance(const String& p_file) {
return NULL;
}
if (_cyclical_dependency_exists(edited_scene->get_filename(), instanced_scene)) {
// If the scene hasn't been saved yet a cyclical dependency cannot exist.
if (edited_scene->get_filename()!="") {
accept->get_ok()->set_text("Ok");
accept->set_text(String("Cannot instance the scene '")+p_file+String("' because the current scene exists within one of its' nodes."));
accept->popup_centered(Size2(300,90));
return NULL;
if (_cyclical_dependency_exists(edited_scene->get_filename(), instanced_scene)) {
accept->get_ok()->set_text("Ok");
accept->set_text(String("Cannot instance the scene '")+p_file+String("' because the current scene exists within one of its' nodes."));
accept->popup_centered(Size2(300,90));
return NULL;
}
}
instanced_scene->generate_instance_state();