Commit: a9d2f5172285acf838e66719bff44033b079d123
Author: Sergey Sharybin
Date: Tue Jun 7 15:47:39 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rBa9d2f5172285acf838e66719bff44033b079d123
Cycles: Limit degenerated triangle check got CUDA only
OpenCL seems to work fine here, and for some reason that comparison was
giving compilation error on OpenCL here.
Better to compile OpenCL kernel than to be fully robust to weird corner
cases.
===================================================================
M intern/cycles/kernel/geom/geom_triangle_intersect.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h
b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 4e2f46d..b6dfc76 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -159,7 +159,7 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
if(kernel_tex_fetch(__prim_visibility, triAddr) & visibility)
#endif
{
-#ifdef __KERNEL_GPU__
+#ifdef __KERNEL_CUDA__
if(A == B && B == C) {
return false;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
