blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix return type in case of single channel half.

This commit is contained in:
Thomas Dinges 2016-06-19 17:38:39 +02:00
parent 6311a9ff23
commit 600f7df71b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
}
if(is_half) {
return IMAGE_DATA_TYPE_HALF4;
return (channels > 1) ? IMAGE_DATA_TYPE_HALF4 : IMAGE_DATA_TYPE_HALF;
}
else if(is_float) {
return (channels > 1) ? IMAGE_DATA_TYPE_FLOAT4 : IMAGE_DATA_TYPE_FLOAT;