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_font.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_font.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index f0afe184233..0f75d9b5ab0 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -230,8 +230,10 @@ void blf_batch_draw(void) GPU_blend_set_func_separate( GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); +#ifndef BLF_STANDALONE /* We need to flush widget base first to ensure correct ordering. */ UI_widgetbase_draw_cache_flush(); +#endif GPUTexture *texture = blf_batch_cache_texture_load(); GPU_texture_bind(texture, 0); |