diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2018-03-02 12:52:32 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2018-03-02 12:53:13 +0300 |
| commit | f2a2d5492b977bd4b6d03160e19dad6d2ff2f551 (patch) | |
| tree | b21f3cae45bfa7ba15eaaba66bd1ed35a9cb256b /intern | |
| parent | a9509a2f8a9abfdd12bb21153879af05924db2b5 (diff) | |
Cycles: Fix building of OpenCL kernels after volume optimization commit
OpenCL is C based, so no support for operators.
Related commit: 7377d411b47d50cd943cd
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_math_int3.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 |