diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-26 11:00:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-26 11:00:31 +0300 |
| commit | 9623d93f14155cc4a1188385bb60845c5ac9d50a (patch) | |
| tree | 8ab6b476ae12c1154ac85988add8cad4dfba9391 /intern/cycles/render/shader.cpp | |
| parent | 0f2d0ff124c67d474a29406525953e63a659bb91 (diff) | |
Cycles: Fix access undefined macro on non-MSVC compiler
Also rremove trailing whitespace.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
| -rw-r--r-- | intern/cycles/render/shader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 015d0fa087b..ef89288f167 100644 --- 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 |