[Bf-blender-cvs] [5e4ed3f] temp_custom_loop_normals: Cycles: Further tweaks to T43511 to solve compilation error on 32bit platforms
Sergey Sharybin
noreply at git.blender.org
Mon Feb 2 20:22:53 CET 2015
Commit: 5e4ed3f2f94109a01e7e01973fc35612e5967d05
Author: Sergey Sharybin
Date: Mon Feb 2 22:08:01 2015 +0500
Branches: temp_custom_loop_normals
https://developer.blender.org/rB5e4ed3f2f94109a01e7e01973fc35612e5967d05
Cycles: Further tweaks to T43511 to solve compilation error on 32bit platforms
===================================================================
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 329b18f..1465aa3 100644
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@ -51,7 +51,11 @@ 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)
+ccl_device_noinline
+# else
ccl_device_inline
+# endif
#else
ccl_device_noinline
#endif
More information about the Bf-blender-cvs
mailing list