Commit: 5e2835037a27e2e31e5adb71ecf059eddc3b9a68 Author: Sergey Sharybin Date: Sat Jun 20 19:01:24 2015 +0200 Branches: master https://developer.blender.org/rB5e2835037a27e2e31e5adb71ecf059eddc3b9a68
Cycles: Tweak to previous commit, experimental sm_52 works on Linux but not OSX =================================================================== 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 2b7f4d7..2bb9be7 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
