From 600f7df71b7086a15db0e115edd40129ed2fa7d5 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sun, 19 Jun 2016 17:38:39 +0200 Subject: [PATCH] Fix return type in case of single channel half. --- intern/cycles/render/image.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;