diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-11 06:52:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-11 06:52:57 +0300 |
| commit | 4184f890fdbef7409af27f1e9a13b01161001ef2 (patch) | |
| tree | 2958d2c1579c5055ff8aa708774150ef8d20a90f /source/blender/blenfont/intern/blf_glyph.c | |
| parent | f9cca128869fc07da46c095ac7dce16467121092 (diff) | |
GPU: minor changes to support standalone GHOST builds
- Move gpuPush/Pop from GPU_draw.h into GPU_state.h
as this is for pushing/popping state.
- Add 'GPU_STANDALONE' define, to bypass use of user-preferences
for theme colors and pixelsize, as well as pbvh init/free functions.
Needed to get GHOST tests working again.
Diffstat (limited to 'source/blender/blenfont/intern/blf_glyph.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 3ab6814c531..3270eec58f9 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -46,10 +46,8 @@ #include "BLF_api.h" -#ifndef BLF_STANDALONE -# include "GPU_immediate.h" -# include "GPU_extensions.h" -#endif +#include "GPU_immediate.h" +#include "GPU_extensions.h" #include "blf_internal_types.h" #include "blf_internal.h" |