Merge pull request #51014 from pycbouh/core-texture-webp-crash-3.x

[3.x] Fix a crash when trying to load a WebP `StreamTexture`
This commit is contained in:
Rémi Verschelde 2021-07-29 16:00:30 +02:00 committed by GitHub
commit bab9c02f47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -554,9 +554,10 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &tw_
} }
Ref<Image> img; Ref<Image> img;
if (df & FORMAT_BIT_PNG) { bool is_png = df & FORMAT_BIT_PNG;
if (is_png && Image::png_unpacker) {
img = Image::png_unpacker(pv); img = Image::png_unpacker(pv);
} else { } else if (!is_png && Image::webp_unpacker) {
img = Image::webp_unpacker(pv); img = Image::webp_unpacker(pv);
} }