[Bf-blender-cvs] [f2a2d5492b9] master: Cycles: Fix building of OpenCL kernels after volume optimization commit
Mai Lavelle
noreply at git.blender.org
Fri Mar 2 10:57:08 CET 2018
Commit: f2a2d5492b977bd4b6d03160e19dad6d2ff2f551
Author: Mai Lavelle
Date: Fri Mar 2 04:52:32 2018 -0500
Branches: master
https://developer.blender.org/rBf2a2d5492b977bd4b6d03160e19dad6d2ff2f551
Cycles: Fix building of OpenCL kernels after volume optimization commit
OpenCL is C based, so no support for operators.
Related commit: 7377d411b47d50cd943cd
===================================================================
M intern/cycles/util/util_math_int3.h
===================================================================
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
More information about the Bf-blender-cvs
mailing list