sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Fix compilation error on windows after recent logging changes

Browse Source
This commit is contained in:
Sergey Sharybin 2015-04-10 22:35:10 +05:00
parent d850fd8244
commit 35812e65f4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/device/device_cpu.cpp
View File

@ -19,6 +19,15 @@
/* So ImathMath is included before our kernel_cpu_compat. */
#ifdef WITH_OSL
# if defined(_MSC_VER)
/* Prevent OSL from polluting the context with weird macros 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