aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/editor_import_export.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2015-12-21 09:07:06 -0300
committerJuan Linietsky2015-12-21 09:07:06 -0300
commit15429d6ac95acb044c9eebd64356f33e7e5d14ef (patch)
tree872a375b64d93fd6aaf1239e058a13630c9cfabe /tools/editor/editor_import_export.cpp
parent81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (diff)
parentb2f670ebaefa16b0345f9a7ae825f78dbfdec9f8 (diff)
downloadgodot-15429d6ac95acb044c9eebd64356f33e7e5d14ef.tar.gz
godot-15429d6ac95acb044c9eebd64356f33e7e5d14ef.tar.zst
godot-15429d6ac95acb044c9eebd64356f33e7e5d14ef.zip
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/editor_import_export.cpp')
-rw-r--r--tools/editor/editor_import_export.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index 35f937503..c50a95a93 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -1128,10 +1128,7 @@ Error EditorExportPlatform::save_zip(const String& p_path, bool p_make_bundles)
zipClose(zip,NULL);
- if (err)
- return err;
-
-
+ return err;
}
Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p_alignment) {