Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 9 May 2018 08:02:33 +0000 (10:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 9 May 2018 08:02:33 +0000 (10:02 +0200)
1  2 
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/intern/wm_init_exit.c

index cdbfec4030dd470a49fd715ec9b6c0568e9c42fd,5169657206c6ff163dbb3693f29cb8edc0e9567a..515989484d3a1ed257bb84968170e666c8b5a65f
@@@ -44,17 -44,8 +44,8 @@@ struct bGPdata
  struct SmoothView3DStore;
  struct wmTimer;
  struct Material;
 -struct GPUFX;
 +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"