diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-08-14 23:22:21 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-08-14 23:24:29 +0300 |
| commit | a18b2ba64366bd1a4c9a729aaafce68ab1fee5a7 (patch) | |
| tree | d1c552d41fed1078c2504dc6e138c671a3192780 /intern/cycles/render | |
| parent | 9396e11180fbdc380f06dbd4c696a9c39ff32ec9 (diff) | |
Cycles: Use half storage for 16bit files (e.g. 16bit pngs) as well.
Note: This only works for textures loaded from disk via OIIO, not packed textures. That's still a ToDo.
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/image.cpp | 4 |
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; |