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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-06-19 21:17:03 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-06-19 21:17:25 +0300
commit48caadfdd5ed8750213451220238b05caf2c3148 (patch)
treec61ceb594b23de170f73d90133d834e6b61191d2
parent600f7df71b7086a15db0e115edd40129ed2fa7d5 (diff)
Fix Cycles assert after recent half changes.
-rw-r--r--intern/cycles/device/device_memory.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h
index 8c32d03135e..5b5b4dc6802 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;