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

Merge pull request #4011 from neikeq/fix_regr_3280

Browse source 
TileSet Export: Avoid invalid error when merge is enabled but file doesn't exist
This commit is contained in:
Rémi Verschelde 2016-03-11 07:10:48 +01:00
commit ebc581becf
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tools/editor/editor_node.cpp
View file

@ -1267,23 +1267,20 @@ void EditorNode::_dialog_action(String p_file) {
if (FileAccess::exists(p_file)) {
ml=ResourceLoader::load(p_file,"TileSet");
if (!file_export_lib_merge->is_pressed()) {
if (ml.is_null()) {
if (file_export_lib_merge->is_pressed()) {
current_option=-1;
//accept->get_cancel()->hide();
accept->get_ok()->set_text("I see..");
accept->set_text("Can't load TileSet for merging!.");
accept->popup_centered_minsize();
return;
}
} else if (!file_export_lib_merge->is_pressed()) {
ml->clear();
}
}
if (ml.is_null()) {
if (file_export_lib_merge->is_pressed()) {
current_option=-1;
//accept->get_cancel()->hide();
accept->get_ok()->set_text("I see..");
accept->set_text("Can't load TileSet for merging!.");
accept->popup_centered_minsize();
return;
}
} else {
ml = Ref<TileSet>( memnew( TileSet ));
}