[Bf-blender-cvs] [48caadf] master: Fix Cycles assert after recent half changes.

[Brecht Van Lommel]

Commit: 48caadfdd5ed8750213451220238b05caf2c3148
Author: Brecht Van Lommel
Date:   Sun Jun 19 20:17:03 2016 +0200
Branches: master
https://developer.blender.org/rB48caadfdd5ed8750213451220238b05caf2c3148

Fix Cycles assert after recent half changes.

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

M	intern/cycles/device/device_memory.h

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

diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h
index 8c32d03..5b5b4dc 100644
--- a/intern/cycles/device/device_memory.h
+++ b/intern/cycles/device/device_memory.h
@@ -150,6 +150,11 @@ template<> struct device_type_traits<float4> {
 	static const int num_elements = 4;
 };
 
+template<> struct device_type_traits<half> {
+	static const DataType data_type = TYPE_HALF;
+	static const int num_elements = 1;
+};
+
 template<> struct device_type_traits<half4> {
 	static const DataType data_type = TYPE_HALF;
 	static const int num_elements = 4;