diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-09 18:55:42 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-09 18:55:42 +0300 |
| commit | 95ba18af596d93023850b21e174b6c81994021a0 (patch) | |
| tree | 9b042d11c39ef96f219190e414602231aefa3bae /intern/cycles | |
| parent | bba86b97393092cfc943eab8502e034bb763e96a (diff) | |
| parent | c4e8d74563e234e6a2cb6ce77f42452b5577fe38 (diff) | |
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Diffstat (limited to 'intern/cycles')
| -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 6f8c3e3e76c..30468efff91 100644 --- a/intern/cycles/kernel/geom/geom_triangle_intersect.h +++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h @@ -51,7 +51,7 @@ typedef struct IsectPrecalc { /* Workaround for CUDA toolkit 6.5.16. */ #if defined(__KERNEL_CPU__) || !defined(__KERNEL_CUDA_EXPERIMENTAL__) || __CUDA_ARCH__ < 500 -# if (defined(i386) || defined(_M_IX86)) && (__CUDA_ARCH__ > 500) +# if (defined(i386) || defined(_M_IX86)) ccl_device_noinline # else ccl_device_inline |