Commit: 215e474a996c677c323b9e93b8d9dbebb4fbe4b6
Author: Brecht Van Lommel
Date: Mon Mar 16 16:00:59 2020 +0100
Branches: master
https://developer.blender.org/rB215e474a996c677c323b9e93b8d9dbebb4fbe4b6
Fix T74776: Cycles crash with missing image texture after recent changes
===================================================================
M intern/cycles/render/image.cpp
===================================================================
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();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
