diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-29 15:51:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-29 15:51:46 +0200 |
commit | 0543b71e5a7c848e7eec233c428fb2c1fb5caca8 (patch) | |
tree | e2f0bdf92d7c5663782cf3ae74fe5328551c78de | |
parent | 4a3430bd27ca4be5e9dd9cb5997f6894e9acbefd (diff) | |
parent | 0ab661de6316bf1fc8578982d354daf74d3919d8 (diff) |
Merge pull request #51015 from pycbouh/core-texture-webp-crash
Fix a crash when trying to load a WebP `StreamTexture2D`
-rw-r--r-- | scene/resources/texture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 38042d84fd..2ea55843ad 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -354,11 +354,11 @@ Ref<Image> StreamTexture2D::load_image_from_file(FileAccess *f, int p_size_limit } Ref<Image> img; - if (data_format == DATA_FORMAT_BASIS_UNIVERSAL) { + if (data_format == DATA_FORMAT_BASIS_UNIVERSAL && Image::basis_universal_unpacker) { img = Image::basis_universal_unpacker(pv); - } else if (data_format == DATA_FORMAT_PNG) { + } else if (data_format == DATA_FORMAT_PNG && Image::png_unpacker) { img = Image::png_unpacker(pv); - } else { + } else if (data_format == DATA_FORMAT_WEBP && Image::webp_unpacker) { img = Image::webp_unpacker(pv); } |