diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-20 20:40:23 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-20 20:40:23 +0300 |
| commit | a95b0e0e9df75a2128e2276e88869547e872b7a1 (patch) | |
| tree | 1d47c66c981fc886cd8a248b06db869c1235341a | |
| parent | 5e2835037a27e2e31e5adb71ecf059eddc3b9a68 (diff) | |
Cycles: Another fix for OSX, sm_50 experimental actually also fails to compile
Didn't notice it originally because compilation was threaded.
| -rw-r--r-- | intern/cycles/kernel/geom/geom_triangle_intersect.h | 2 |
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 2bb9be79591..3ef918dc842 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -57,7 +57,7 @@ ccl_device_noinline ccl_device_inline # endif /* __CUDA_ARCH__ > 500 */ # else /* (defined(i386) || defined(_M_IX86)) */ -# if defined(__KERNEL_EXPERIMENTAL__) && (__CUDA_ARCH__ > 500) +# if defined(__KERNEL_EXPERIMENTAL__) && (__CUDA_ARCH__ >= 500) ccl_device_noinline # else ccl_device_inline |