diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-03-16 18:00:59 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-03-16 18:02:06 +0300 |
| commit | 215e474a996c677c323b9e93b8d9dbebb4fbe4b6 (patch) | |
| tree | f6d13440aa81da14eefa3f9220783e8c79bd5270 /intern | |
| parent | 20f6700c88648bb65ccad96a4e348a981f216650 (diff) | |
Fix T74776: Cycles crash with missing image texture after recent changes
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/image.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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(); |