godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Merge pull request #17443 from Noshyaar/tilesetcrash

Browse Source 
Fix converting to tileset crashes Godot if existing file is not tileset
This commit is contained in:
Juan Linietsky
2018-04-08 09:31:54 -03:00
committed by GitHub
parent 10448063c4 ed3b080ca6
commit 6eb0c74e9d
6 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
editor/editor_node.cpp
View File

@@ -1234,29 +1234,25 @@ void EditorNode::_dialog_action(String p_file) {
} break;
case FILE_EXPORT_TILESET: {
Ref<TileSet> ml;
if (FileAccess::exists(p_file)) {
ml = ResourceLoader::load(p_file, "TileSet");
Ref<TileSet> tileset;
if (FileAccess::exists(p_file) && file_export_lib_merge->is_pressed()) {
tileset = ResourceLoader::load(p_file, "TileSet");
if (ml.is_null()) {
if (file_export_lib_merge->is_pressed()) {
current_option = -1;
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Can't load TileSet for merging!"));
accept->popup_centered_minsize();
return;
}
} else if (!file_export_lib_merge->is_pressed()) {
ml->clear();
if (tileset.is_null()) {
current_option = -1;
accept->get_ok()->set_text(TTR("I see.."));
accept->set_text(TTR("Can't load TileSet for merging!"));
accept->popup_centered_minsize();
return;
}
} else {
ml = Ref<TileSet>(memnew(TileSet));
tileset = Ref<TileSet>(memnew(TileSet));
}
TileSetEditor::update_library_file(editor_data.get_edited_scene_root(), ml, true);
TileSetEditor::update_library_file(editor_data.get_edited_scene_root(), tileset, true);
Error err = ResourceSaver::save(p_file, ml);
Error err = ResourceSaver::save(p_file, tileset);
if (err) {
current_option = -1;