diff options
| author | Hein-Pieter van Braam | 2018-04-28 16:40:31 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-04-28 16:40:31 +0200 |
| commit | 7ec8a6e75610558530817f4813ca2f11fcc4094d (patch) | |
| tree | df561646ffa324f0aeba34f3c63d3a2445e690c6 /editor | |
| parent | ddb31e9c5abe1fb91bda5e5fee1be4d813d92674 (diff) | |
| download | godot-7ec8a6e75610558530817f4813ca2f11fcc4094d.tar.gz godot-7ec8a6e75610558530817f4813ca2f11fcc4094d.tar.zst godot-7ec8a6e75610558530817f4813ca2f11fcc4094d.zip | |
Fix converting a tilset if the existing file is not a tileset
See ed3b080ca6ebc4361306a786dcc2d45481ee8ed9
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 497de36bc..a4ee0d8d1 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1198,7 +1198,7 @@ void EditorNode::_dialog_action(String p_file) { case FILE_EXPORT_TILESET: { Ref<TileSet> ml; - if (FileAccess::exists(p_file)) { + if (FileAccess::exists(p_file) && file_export_lib_merge->is_pressed()) { ml = ResourceLoader::load(p_file, "TileSet"); if (ml.is_null()) { |