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')
-rw-r--r--source/blender/blenfont/intern/blf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 132a0ec3808..ec1f3d1f1f1 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -56,7 +56,7 @@
#include "IMB_colormanagement.h"
#ifndef BLF_STANDALONE
-#include "GPU_basic_shader.h"
+#include "GPU_shader.h"
#endif
#include "blf_internal_types.h"
@@ -501,7 +501,7 @@ static void blf_draw_gl__start(FontBLF *font, GLint *mode)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
#ifndef BLF_STANDALONE
- GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
+ GPU_shader_bind(GPU_shader_get_builtin_shader(GPU_SHADER_TEXT));
#endif
/* Save the current matrix mode. */
@@ -544,8 +544,9 @@ static void blf_draw_gl__end(GLint mode)
glMatrixMode(mode);
#ifndef BLF_STANDALONE
- GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+ GPU_shader_unbind();
#endif
+
glDisable(GL_BLEND);
}