godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3280 from neikeq/issue_3227

Browse Source 
Fix TileSet not refreshed after exporting without merge
This commit is contained in:
Rémi Verschelde 2016-01-08 18:04:36 +01:00
commit e3d4a851b7
1 changed files with 10 additions and 5 deletions
Show Stats 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: {
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");
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;
//accept->get_cancel()->hide();
accept->get_ok()->set_text("I see..");
@ -1333,9 +1341,6 @@ void EditorNode::_dialog_action(String p_file) {
return;
}
}
if (ml.is_null()) {
ml = Ref<TileSet>( memnew( TileSet ));
}