diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
| commit | 386ba094988fc793f8e060d15438566e5e2d2cae (patch) | |
| tree | 4cbde50b5d1d7a45c89ee99c29dd1b86d1d97b59 /source/blender/editors/screen/glutil.c | |
| parent | 6129e20cec4639aebf335ff13b2ba0c59670662d (diff) | |
| parent | f97a64aa9b7b384f8221a1ef4f2eef9cde1238db (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/editors/screen/glutil.c')
| -rw-r--r-- | source/blender/editors/screen/glutil.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index af1e0eeed79..dc435efd86b 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -24,8 +24,6 @@ #include <stdio.h> #include <string.h> -#include "MEM_guardedalloc.h" - #include "DNA_userdef_types.h" #include "DNA_vec_types.h" @@ -41,7 +39,10 @@ #include "GPU_immediate.h" #include "GPU_matrix.h" -#include "GPU_state.h" + +#ifdef __APPLE__ +# include "GPU_state.h" +#endif #include "UI_interface.h" |