From 432e478f4399f7833817431769b6136c7adf1ae8 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 2 Feb 2015 22:08:01 +0500
Subject: [PATCH] Cycles: Further tweaks to T43511 to solve compilation error
 on 32bit platforms

---
 intern/cycles/kernel/geom/geom_triangle_intersect.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/intern/cycles/kernel/geom/geom_triangle_intersect.h b/intern/cycles/kernel/geom/geom_triangle_intersect.h
index 329b18f516a..1465aa356da 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