diff options
| author | reduz | 2015-12-26 10:27:04 -0300 |
|---|---|---|
| committer | reduz | 2015-12-26 10:27:04 -0300 |
| commit | 9d9520f227d58c2499e906d72002cf631e40f4c8 (patch) | |
| tree | d2f238c5048c4aeb199e28b39117559ccd42318c /tools/editor/editor_import_export.cpp | |
| parent | 13964f59c1359473980916ea1f930fef1c28331a (diff) | |
| parent | dfd7bdb00528eb9a45e21a5c99d0e76bd642e74c (diff) | |
| download | godot-9d9520f227d58c2499e906d72002cf631e40f4c8.tar.gz godot-9d9520f227d58c2499e906d72002cf631e40f4c8.tar.zst godot-9d9520f227d58c2499e906d72002cf631e40f4c8.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/editor_import_export.cpp')
| -rw-r--r-- | tools/editor/editor_import_export.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index b6c68d05b..c50a95a93 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -1064,7 +1064,7 @@ Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path MD5Final(&ctx); pd->f->store_buffer(ctx.digest,16); } - pd->ep->step("Storing File: "+p_path,2+p_file*100/p_total); + pd->ep->step("Storing File: "+p_path,2+p_file*100/p_total,false); pd->count++; pd->ftmp->store_buffer(p_data.ptr(),p_data.size()); if (pd->alignment > 1) { @@ -1102,7 +1102,7 @@ Error EditorExportPlatform::save_zip_file(void *p_userdata,const String& p_path, zipWriteInFileInZip(zip,p_data.ptr(),p_data.size()); zipCloseFileInZip(zip); - zd->ep->step("Storing File: "+p_path,2+p_file*100/p_total); + zd->ep->step("Storing File: "+p_path,2+p_file*100/p_total,false); zd->count++; return OK; @@ -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) { |