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
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2016-08-15 02:01:43 +0300
committerThomas Dinges <blender@dingto.org>2016-08-15 02:01:43 +0300
commit9b0f6fa7f77972c2e1838979b2b5bfd0580423d7 (patch)
tree1c30de6d5c99e2d3d245feff612515697ef1d86e /intern/cycles/render
parent4d41d8be790ecee0d91ac7b08b3611ec4d14096a (diff)
Revert "Cycles: Use half storage for 16bit files (e.g. 16bit pngs) as well."
After discussion in IRC, 16bit int should not be converted to half, too much precision loss.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/image.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index fae50f4ea5e..24543601ef9 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -176,9 +176,7 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen
}
/* check if it's half float */
- if(spec.format == TypeDesc::HALF ||
- spec.format == TypeDesc::USHORT ||
- spec.format == TypeDesc::SHORT)
+ if(spec.format == TypeDesc::HALF)
is_half = true;
channels = spec.nchannels;