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

[Campbell Barton]

Commit: 0d4b165d4f2091708a086bffd5f5223e7135af11
Author: Campbell Barton
Date:   Wed May 9 11:25:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0d4b165d4f2091708a086bffd5f5223e7135af11

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesdna/DNA_view3d_types.h
index 515989484d3,6f3cf4e2bec..c027690538b
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -54,9 -54,30 +54,13 @@@ 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
  
 -/* Background Picture in 3D-View */
 -typedef struct BGpic {
 -	struct BGpic *next, *prev;
 -
 -	struct Image *ima;
 -	struct ImageUser iuser;
 -	struct MovieClip *clip;
 -	struct MovieClipUser cuser;
 -	float xof, yof, size, blend, rotation;
 -	short view;
 -	short flag;
 -	short source;
 -	char pad[6];
 -} BGpic;
 -
 -/* ********************************* */
 -
  typedef struct RegionView3D {
  	
  	float winmat[4][4];			/* GL_PROJECTION matrix */