From 215e474a996c677c323b9e93b8d9dbebb4fbe4b6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 16 Mar 2020 16:00:59 +0100 Subject: Fix T74776: Cycles crash with missing image texture after recent changes --- intern/cycles/render/image.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 78c854c9261..8868811b5e7 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -304,7 +304,12 @@ void ImageManager::load_image_metadata(Image *img) metadata = ImageMetaData(); metadata.colorspace = img->params.colorspace; - img->loader->load_metadata(metadata); + if (img->loader->load_metadata(metadata)) { + assert(metadata.type != IMAGE_DATA_NUM_TYPES); + } + else { + metadata.type = IMAGE_DATA_TYPE_BYTE4; + } metadata.detect_colorspace(); -- cgit v1.2.3