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_font.c | |
| parent | 00f83ec125207e90bf180b3eb7752d8cb6482a86 (diff) | |
| parent | cb6cec904fa14ce0ab10a2a53af5c936d56376cf (diff) | |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
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); |