sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T74776: Cycles crash with missing image texture after recent changes

Browse Source
This commit is contained in:
Brecht Van Lommel 2020-03-16 16:00:59 +01:00
parent 20f6700c88
commit 215e474a99
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/render/image.cpp
View File

@ -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();