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:
authorDalai Felinto <dfelinto@gmail.com>2017-03-30 12:19:58 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-03-30 12:20:54 +0300
commitf4d597efffcb129614988f081d7f239ec1733642 (patch)
tree7f973c31a2cc34e808d17d8e0cbb43bea92e87a8 /source/blender/windowmanager/intern/wm_operators.c
parent10b27bd30ab8193305b064941c827dd2cda9eeb1 (diff)
Fix breakage when using radial control (shift f) with weight paint
This was likely introduced on rBf90b480f957f . Basically the BLF routines have their own shaders, so any previous programs must be unbind before it
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 3d747e45fde..fc3e29a814f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -3251,6 +3251,7 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd
imm_draw_lined_circle(pos, 0.0f, 0.0f, r2, 40);
if (rmin > 0.0f)
imm_draw_lined_circle(pos, 0.0, 0.0f, rmin, 40);
+ immUnbindProgram();
BLF_size(fontid, 1.5 * fstyle_points * U.pixelsize, U.dpi);
BLF_enable(fontid, BLF_SHADOW);
@@ -3267,7 +3268,6 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd
glDisable(GL_BLEND);
glDisable(GL_LINE_SMOOTH);
- immUnbindProgram();
}
typedef enum {