[Bf-blender-cvs] [f4d597efffc] blender2.8: Fix breakage when using radial control (shift f) with weight paint

Dalai Felinto noreply at git.blender.org
Thu Mar 30 11:21:04 CEST 2017


Commit: f4d597efffcb129614988f081d7f239ec1733642
Author: Dalai Felinto
Date:   Thu Mar 30 11:19:58 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf4d597efffcb129614988f081d7f239ec1733642

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

===================================================================

M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

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 {




More information about the Bf-blender-cvs mailing list