Commit: a95b0e0e9df75a2128e2276e88869547e872b7a1 Author: Sergey Sharybin Date: Sat Jun 20 19:40:23 2015 +0200 Branches: master https://developer.blender.org/rBa95b0e0e9df75a2128e2276e88869547e872b7a1
Cycles: Another fix for OSX, sm_50 experimental actually also fails to compile Didn't notice it originally because compilation was threaded. =================================================================== 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 2bb9be7..3ef918d 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 _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
