Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/image.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 24543601ef9..fae50f4ea5e 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -176,7 +176,9 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
}
/* check if it's half float */
- if(spec.format == TypeDesc::HALF)
+ if(spec.format == TypeDesc::HALF ||
+ spec.format == TypeDesc::USHORT ||
+ spec.format == TypeDesc::SHORT)
is_half = true;
channels = spec.nchannels;