From f2a2d5492b977bd4b6d03160e19dad6d2ff2f551 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Fri, 2 Mar 2018 04:52:32 -0500 Subject: Cycles: Fix building of OpenCL kernels after volume optimization commit OpenCL is C based, so no support for operators. Related commit: 7377d411b47d50cd943cd --- intern/cycles/util/util_math_int3.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'intern') diff --git a/intern/cycles/util/util_math_int3.h b/intern/cycles/util/util_math_int3.h index 1bc6ca7f376..6eef8517665 100644 --- a/intern/cycles/util/util_math_int3.h +++ b/intern/cycles/util/util_math_int3.h @@ -76,8 +76,6 @@ ccl_device_inline int3 clamp(const int3& a, int3& mn, int mx) clamp(a.z, mn.z, mx)); #endif } -#endif /* !__KERNEL_OPENCL__ */ - ccl_device_inline bool operator==(const int3 &a, const int3 &b) { @@ -93,6 +91,7 @@ ccl_device_inline bool operator<(const int3 &a, const int3 &b) { return a.x < b.x && a.y < b.y && a.z < b.z; } +#endif /* !__KERNEL_OPENCL__ */ CCL_NAMESPACE_END -- cgit v1.2.3