Merge branch 'master' into blender2.8
This commit is contained in:
commit
0d4b165d4f
|
@ -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 {
|
||||
|
||||
|
|
|
@ -34,10 +34,8 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
# include <windows.h>
|
||||
# undef near
|
||||
# undef far
|
||||
#endif
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
|
Loading…
Reference in New Issue