diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-21 11:43:44 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-21 11:43:44 +0100 |
| commit | 7adfd1dbe6d9fa6ce3c0839536a0059d37321d14 (patch) | |
| tree | acc1479bd68f14c345293f85ec4698c5cd1a50f2 /platform/windows/export/export_plugin.cpp | |
| parent | d0b4cca7a6ff0b752689f1ab1b66e135158a062a (diff) | |
| parent | 908bef8eee145408bbf660e873279a978a0acb74 (diff) | |
Merge pull request #68916 from bruvzg/no_img_error
[Export] Use image loader directly to avoid "resource as image file" errors.
Diffstat (limited to 'platform/windows/export/export_plugin.cpp')
| -rw-r--r-- | platform/windows/export/export_plugin.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index bfd40e1c9c..f04177d79a 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/export/export_plugin.cpp @@ -31,6 +31,7 @@ #include "export_plugin.h" #include "core/config/project_settings.h" +#include "core/io/image_loader.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" @@ -84,8 +85,10 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> & f->seek(prev_offset); } } else { - Ref<Image> src_image = Image::load_from_file(p_src_path); - ERR_FAIL_COND_V(src_image.is_null() || src_image->is_empty(), ERR_CANT_OPEN); + Ref<Image> src_image; + src_image.instantiate(); + err = ImageLoader::load_image(p_src_path, src_image); + ERR_FAIL_COND_V(err != OK || src_image->is_empty(), ERR_CANT_OPEN); for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) { int size = (icon_size[i] == 0) ? 256 : icon_size[i]; |