summaryrefslogtreecommitdiff
path: root/platform/macos/export
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2022-11-20 13:16:16 +0200
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2022-11-21 10:11:59 +0200
commit908bef8eee145408bbf660e873279a978a0acb74 (patch)
treeb517c729cc4eecf06b2bce37e09bb62b320c933a /platform/macos/export
parentdce1602edacd8ad96a70f29e4f524d7b7c231e3f (diff)
[Export] Use image loader directly to avoid "resource as image file" errors.
Diffstat (limited to 'platform/macos/export')
-rw-r--r--platform/macos/export/export_plugin.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp
index ae8c802caf..5860a4f0ae 100644
--- a/platform/macos/export/export_plugin.cpp
+++ b/platform/macos/export/export_plugin.cpp
@@ -34,6 +34,7 @@
#include "lipo.h"
#include "macho.h"
+#include "core/io/image_loader.h"
#include "core/string/translation.h"
#include "editor/editor_node.h"
#include "editor/editor_paths.h"
@@ -1269,8 +1270,10 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
icon->get_buffer(&data.write[0], icon->get_length());
}
} else {
- Ref<Image> icon = Image::load_from_file(iconpath);
- if (icon.is_valid() && !icon->is_empty()) {
+ Ref<Image> icon;
+ icon.instantiate();
+ err = ImageLoader::load_image(iconpath, icon);
+ if (err == OK && !icon->is_empty()) {
_make_icon(p_preset, icon, data);
}
}