[Bf-blender-cvs] [6443bfd] master: * Fix OpenCL after uchar4 commit.

[Thomas Dinges]

Commit: 6443bfdeb1b606cf5fcb7bf132792bd0a6c00674
Author: Thomas Dinges
Date:   Sun Jun 15 01:09:35 2014 +0200
https://developer.blender.org/rB6443bfdeb1b606cf5fcb7bf132792bd0a6c00674

* Fix OpenCL after uchar4 commit.

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

M	intern/cycles/kernel/kernel_compat_opencl.h

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

diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h
index 8346b09..9e58ebf 100644
--- a/intern/cycles/kernel/kernel_compat_opencl.h
+++ b/intern/cycles/kernel/kernel_compat_opencl.h
@@ -68,6 +68,9 @@
 #ifdef make_int4
 #undef make_int4
 #endif
+#ifdef make_uchar4
+#undef make_uchar4
+#endif
 
 #define make_float2(x, y) ((float2)(x, y))
 #ifdef __CL_NO_FLOAT3__
@@ -79,6 +82,7 @@
 #define make_int2(x, y) ((int2)(x, y))
 #define make_int3(x, y, z) ((int3)(x, y, z))
 #define make_int4(x, y, z, w) ((int4)(x, y, z, w))
+#define make_uchar4(x, y, z, w) ((uchar4)(x, y, z, w))
 
 /* math functions */
 #define __uint_as_float(x) as_float(x)