diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-06-19 18:38:39 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-06-19 18:38:39 +0300 |
| commit | 600f7df71b7086a15db0e115edd40129ed2fa7d5 (patch) | |
| tree | a8db406f510b3e1050956df02ead35b19ccd0834 /intern/cycles | |
| parent | 6311a9ff234aecb054121bf12ad03da6242fc092 (diff) | |
Fix return type in case of single channel half.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/render/image.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index c5e819520ea..99d22238bdf 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -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; |