diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 12:25:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 12:25:35 +0300 |
| commit | 0d4b165d4f2091708a086bffd5f5223e7135af11 (patch) | |
| tree | d58807b47dfd354b9dcb00d7cd39bafb94a2ef74 /source/blender/makesdna | |
| parent | 1cbe3b6e0388b27c7866fd1e97230551ec4032f1 (diff) | |
| parent | b59b8124001182a40bf4aa271591d589b2d46cfa (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 515989484d3..c027690538b 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -54,8 +54,12 @@ struct GPUViewport; /* ******************************** */ -/* The near/far thing is a Win EXCEPTION. Thus, leave near/far in the - * code, and patch for windows. */ +/* The near/far thing is a Win EXCEPTION, caused by indirect includes from <windows.h>. + * Thus, leave near/far in the code, and undef for windows. */ +#ifdef _WIN32 +# undef near +# undef far +#endif typedef struct RegionView3D { |