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:
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
-rw-r--r--source/blender/blenfont/intern/blf.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 3369e1c08b6..8b654d25bcf 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -55,6 +55,8 @@
#include "IMB_colormanagement.h"
+#include "GPU_simple_shader.h"
+
#include "blf_internal_types.h"
#include "blf_internal.h"
@@ -494,9 +496,10 @@ static void blf_draw_gl__start(FontBLF *font, GLint *mode)
*/
glEnable(GL_BLEND);
- glEnable(GL_TEXTURE_2D);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ GPU_simple_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
+
/* Save the current matrix mode. */
glGetIntegerv(GL_MATRIX_MODE, mode);
@@ -536,8 +539,8 @@ static void blf_draw_gl__end(GLint mode)
if (mode != GL_MODELVIEW)
glMatrixMode(mode);
+ GPU_simple_shader_bind(GPU_SHADER_USE_COLOR);
glDisable(GL_BLEND);
- glDisable(GL_TEXTURE_2D);
}
void BLF_draw_ex(