[Bf-blender-cvs] [9b0f6fa] master: Revert "Cycles: Use half storage for 16bit files (e.g. 16bit pngs) as well."

[Thomas Dinges]

Commit: 9b0f6fa7f77972c2e1838979b2b5bfd0580423d7
Author: Thomas Dinges
Date:   Mon Aug 15 01:01:43 2016 +0200
Branches: master
https://developer.blender.org/rB9b0f6fa7f77972c2e1838979b2b5bfd0580423d7

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.

===================================================================

M	intern/cycles/render/image.cpp

===================================================================

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index fae50f4..2454360 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;