Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 13:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix TileSet not refreshed after exporting without merge

Browse source
This commit is contained in:
Ignacio Etcheverry 2016-01-08 17:54:13 +01:00
parent b6388e6001
commit b4602567cf
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tools/editor/editor_node.cpp
View file

@ -1321,10 +1321,18 @@ void EditorNode::_dialog_action(String p_file) {
case FILE_EXPORT_TILESET: { case FILE_EXPORT_TILESET: {
Ref<TileSet> ml; Ref<TileSet> ml;
if (file_export_lib_merge->is_pressed() && FileAccess::exists(p_file)) { if (FileAccess::exists(p_file)) {
ml=ResourceLoader::load(p_file,"TileSet"); ml=ResourceLoader::load(p_file,"TileSet");
if (ml.is_null()) { if (!file_export_lib_merge->is_pressed()) {
ml->clear();
}
}
if (ml.is_null()) {
if (file_export_lib_merge->is_pressed()) {
current_option=-1; current_option=-1;
//accept->get_cancel()->hide(); //accept->get_cancel()->hide();
accept->get_ok()->set_text("I see.."); accept->get_ok()->set_text("I see..");
@ -1333,9 +1341,6 @@ void EditorNode::_dialog_action(String p_file) {
return; return;
} }
}
if (ml.is_null()) {
ml = Ref<TileSet>( memnew( TileSet )); ml = Ref<TileSet>( memnew( TileSet ));
} }