diff options
| author | Severin <julian_eisel@web.de> | 2014-12-04 22:48:11 +0300 |
|---|---|---|
| committer | Severin <julian_eisel@web.de> | 2014-12-04 22:48:11 +0300 |
| commit | 1254e98a48aa92bbf6e707fbc28f42bee17a264f (patch) | |
| tree | 8cd67d04e91e3513bb55e5e93d7f78a30c77ddc4 /intern/cycles/render | |
| parent | 151f2467a4c42d787d6d26869dbe402ccb725679 (diff) | |
| parent | 226eb53bc7f6d0aa1769b6c889d3b15d1f4944b5 (diff) | |
Merge branch 'master' into imeinput_method_editor
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/shader.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index b267731abe5..29c10ffa4f3 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -18,6 +18,15 @@ #define __SHADER_H__ #ifdef WITH_OSL +# if defined(_MSC_VER) +/* Prevent OSL from pollyting the context with weird macroses from windows.h. + * TODO(sergey): Ideally it's only enough to have class/struct declarations in + * the header and skip header include here. + */ +# define NOGDI +# define NOMINMAX +# define WIN32_LEAN_AND_MEAN +# endif # include <OSL/oslexec.h> #endif |