Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-04-07 15:03:32 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-04-07 15:03:32 +0300
commit1a337074175e51c705de0afd230264ff73e04b4b (patch)
tree345d532d9c26ac2df3a6b55f9ab34de67487307e /source/blender/blenfont
parent2d618974d14672e6ec38612e76aca70e619f7242 (diff)
UI: Fix waveform widget text drawing.
Flush the text cache so that we have proper scissor test and ordering.
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r--source/blender/blenfont/BLF_api.h1
-rw-r--r--source/blender/blenfont/intern/blf.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 3466f1665c6..668588435b4 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -98,6 +98,7 @@ void BLF_matrix(int fontid, const float m[16]);
/* Batch drawcalls together as long as
* the modelview matrix and the font remain unchanged. */
void BLF_batch_draw_begin(void);
+void BLF_batch_draw_flush(void);
void BLF_batch_draw_end(void);
/* Draw the string using the default font, size and dpi. */
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index b94c6e35823..fafee125264 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -548,6 +548,13 @@ void BLF_batch_draw_begin(void)
g_batch.enabled = true;
}
+void BLF_batch_draw_flush(void)
+{
+ if (g_batch.enabled) {
+ blf_batch_draw();
+ }
+}
+
void BLF_batch_draw_end(void)
{
BLI_assert(g_batch.enabled == true);