Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-06-07 16:47:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-06-07 16:48:56 +0300
commitb595a692c861647f95a39270cf7c123cc830c8c7 (patch)
treecbf360906d54889a8127830e3c7f96ee1e5047a4
parentb6954c8da1c4aa9816bccf246d80f134f7da90cc (diff)
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.
-rw-r--r--intern/cycles/kernel/geom/geom_triangle_intersect.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 4e2f46d58d3..b6dfc769012 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;
}