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

[Thomas Dinges]

Commit: a18b2ba64366bd1a4c9a729aaafce68ab1fee5a7
Author: Thomas Dinges
Date:   Sun Aug 14 22:22:21 2016 +0200
Branches: master
https://developer.blender.org/rBa18b2ba64366bd1a4c9a729aaafce68ab1fee5a7

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.

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

M	intern/cycles/render/image.cpp

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

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