Cycles: Fix access undefined macro on non-MSVC compiler

Also rremove trailing whitespace.
2017-04-26 10:00:31 +02:00 · 2017-04-26 10:00:31 +02:00 · 9623d93f14
parent 0f2d0ff124
commit 9623d93f14
1 changed files with 3 additions and 3 deletions
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@ -53,10 +53,10 @@ static float beckmann_table_slope_max()
 /* MSVC 2015 needs this ugly hack to prevent a codegen bug on x86
 * see T50176 for details
 */
-#if _MSC_VER==1900
-#  define MSVC_VOLATILE volatile  
+#if defined(_MSC_VER) && (_MSC_VER == 1900)
+#  define MSVC_VOLATILE volatile
 #else
-#  define MSVC_VOLATILE 
+#  define MSVC_VOLATILE
 #endif

 /* Paper used: Importance Sampling Microfacet-Based BSDFs with the