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-08 02:14:43 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-04-08 02:14:43 +0300
commit0b5ebb3265b155658d441135e152f32ba11c001d (patch)
treea518d91a7292b63aa0406577b98afcccdcf12cac /source/blender/blenfont/intern/blf_internal_types.h
parent3725d82cee97b980e514aed1b226deb91aae9fe6 (diff)
BLF: Fix problem with bound texture.
Previous code was assuming that the glyph texture would remain bound to GL_TEXTURE0 until the cache would be drawn. This is not always the case, so better save the texture and rebind it before drawing.
Diffstat (limited to 'source/blender/blenfont/intern/blf_internal_types.h')
-rw-r--r--source/blender/blenfont/intern/blf_internal_types.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index af2dc8a66e9..1d70980d33d 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -45,6 +45,7 @@ typedef struct BatchBLF{
float ofs[2]; /* copy of font->pos */
float mat[4][4]; /* previous call modelmatrix. */
bool enabled, active, simple_shader;
+ unsigned int tex_bind_state;
} BatchBLF;
extern BatchBLF g_batch;