[Bf-blender-cvs] [5022d9f] master: Cycles: Don't include SIMD util file for OpenCL/CUDA, this fixes OpenCL compilation.

Thomas Dinges noreply at git.blender.org
Mon Jan 6 21:29:37 CET 2014


Commit: 5022d9f81b094da8520809daeb721978707b6cfc
Author: Thomas Dinges
Date:   Mon Jan 6 21:28:18 2014 +0100
https://developer.blender.org/rB5022d9f81b094da8520809daeb721978707b6cfc

Cycles: Don't include SIMD util file for OpenCL/CUDA, this fixes OpenCL compilation.

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

M	intern/cycles/util/util_color.h

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

diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h
index 4e19550..0cfa404 100644
--- a/intern/cycles/util/util_color.h
+++ b/intern/cycles/util/util_color.h
@@ -19,7 +19,10 @@
 
 #include "util_math.h"
 #include "util_types.h"
+
+#ifdef __KERNEL_SSE2__
 #include "util_simd.h"
+#endif
 
 CCL_NAMESPACE_BEGIN




More information about the Bf-blender-cvs mailing list