diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:02:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-09 11:02:33 +0300 |
| commit | a92557f77b46784bb2631981fbf9fd67468419d1 (patch) | |
| tree | c7c1e0610d6b76aac0db873cad78e54c3a8f7f3e /source/blender/makesdna | |
| parent | 2d2875fc158d2fbcade1d335f2ca3921cb65d87e (diff) | |
| parent | 598216c36e2461ddcaa7dd72e4d50691710c4647 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index cdbfec4030d..515989484d3 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -46,15 +46,6 @@ struct wmTimer; struct Material; struct GPUViewport; -/* This is needed to not let VC choke on near and far... old - * proprietary MS extensions... */ -#ifdef WIN32 -#undef near -#undef far -#define near clipsta -#define far clipend -#endif - #include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_image_types.h" |