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

Fix converting a tilset if the existing file is not a tileset 

See ed3b080ca6
This commit is contained in:
Hein-Pieter van Braam 2018-04-28 16:40:31 +02:00
parent ddb31e9c5a
commit 7ec8a6e756
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_node.cpp
View File

@ -1198,7 +1198,7 @@ void EditorNode::_dialog_action(String p_file) {
case FILE_EXPORT_TILESET: { case FILE_EXPORT_TILESET: {
Ref<TileSet> ml; 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"); ml = ResourceLoader::load(p_file, "TileSet");
if (ml.is_null()) { if (ml.is_null()) {