[Bf-blender-cvs] [a92557f77b4] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: a92557f77b46784bb2631981fbf9fd67468419d1
Author: Campbell Barton
Date:   Wed May 9 10:02:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa92557f77b46784bb2631981fbf9fd67468419d1

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/makesdna/DNA_view3d_types.h
index cdbfec4030d,5169657206c..515989484d3
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -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"