[Bf-blender-cvs] [2307bd7] master: Cycles: Keep ccl_always_inline always inlining the stuff

[Sergey Sharybin]

Commit: 2307bd7174da44284205d3dc18fb4845cac5cad0
Author: Sergey Sharybin
Date:   Fri Sep 26 02:03:49 2014 +0600
Branches: master
https://developer.blender.org/rB2307bd7174da44284205d3dc18fb4845cac5cad0

Cycles: Keep ccl_always_inline always inlining the stuff

It works around strange shading bug when building with MSVC.
If such weirdeness continues, we perhaps would need to use
proper inline flags all the time.

Anyway, lets see how things will behave now.

===================================================================

M	intern/cycles/util/util_types.h

===================================================================

diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index b98ee6f..2a199e5 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -44,12 +44,7 @@
 #define __KERNEL_WITH_SSE_ALIGN__
 
 #if defined(_WIN32) && !defined(FREE_WINDOWS)
-
-#  ifdef NDEBUG
-#    define ccl_device_inline static __forceinline
-#  else
-#    define ccl_device_inline static
-#  endif
+#define ccl_device_inline static __forceinline
 #define ccl_align(...) __declspec(align(__VA_ARGS__))
 #ifdef __KERNEL_64_BIT__
 #define ccl_try_align(...) __declspec(align(__VA_ARGS__))