diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-12 17:58:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-12 17:58:03 +0300 |
| commit | b86be9b2145458037fd0b17433b7af0efa7b6472 (patch) | |
| tree | f333625555402992ebb35d258f93eda1130389e6 /source/blender/blenfont/intern/blf.c | |
| parent | 00f83ec125207e90bf180b3eb7752d8cb6482a86 (diff) | |
| parent | cb6cec904fa14ce0ab10a2a53af5c936d56376cf (diff) | |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 725c4c0712d..5664b9ae0a0 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -47,11 +47,9 @@ #include "IMB_colormanagement.h" -#ifndef BLF_STANDALONE -# include "GPU_shader.h" -# include "GPU_matrix.h" -# include "GPU_immediate.h" -#endif +#include "GPU_shader.h" +#include "GPU_matrix.h" +#include "GPU_immediate.h" #include "blf_internal_types.h" #include "blf_internal.h" |