From 61db9ee27a442f30248e6bf48468fee5cc999b6b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 29 Mar 2017 11:49:50 +0200 Subject: Cycles: Attempt to workaround compilation error on new CUDA toolkit and sm_2x --- intern/cycles/util/util_math_intersect.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/util_math_intersect.h b/intern/cycles/util/util_math_intersect.h index f0f505c311e..2b65a0dfa48 100644 --- a/intern/cycles/util/util_math_intersect.h +++ b/intern/cycles/util/util_math_intersect.h @@ -79,7 +79,12 @@ ccl_device bool ray_aligned_disk_intersect( return true; } -ccl_device_forceinline bool ray_triangle_intersect( +#if defined(__KERNEL_CUDA__) && __CUDA_ARCH__ < 300 +ccl_device_inline +#else +ccl_device_forceinline +#endif +bool ray_triangle_intersect( float3 ray_P, float3 ray_dir, float ray_t, #if defined(__KERNEL_SSE2__) && defined(__KERNEL_SSE__) const ssef *ssef_verts, -- cgit v1.2.3