[Bf-blender-cvs] [0f8da4f014a] master: Fix T62884 Missing control point in unselected mask handles
Clément Foucault
noreply at git.blender.org
Sat Mar 23 22:46:29 CET 2019
Commit: 0f8da4f014aafee5dbf4de927b372f125a847b67
Author: Clément Foucault
Date: Sat Mar 23 22:46:15 2019 +0100
Branches: master
https://developer.blender.org/rB0f8da4f014aafee5dbf4de927b372f125a847b67
Fix T62884 Missing control point in unselected mask handles
The fix is a bit dirty. Force alpha 1.0 for these colors by using
immUniformThemeColorShadeAlpha with 255 as alpha_offset.
===================================================================
M source/blender/editors/mask/mask_draw.c
===================================================================
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 82f7cb49d12..0164fe4cc03 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -236,10 +236,10 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
if (point == masklay->act_point)
immUniformColor3f(1.0f, 1.0f, 1.0f);
else
- immUniformThemeColor(TH_HANDLE_VERTEX_SELECT);
+ immUniformThemeColorShadeAlpha(TH_HANDLE_VERTEX_SELECT, 0, 255);
}
else {
- immUniformThemeColor(TH_HANDLE_VERTEX);
+ immUniformThemeColorShadeAlpha(TH_HANDLE_VERTEX, 0, 255);
}
immBegin(GPU_PRIM_POINTS, 1);
@@ -306,10 +306,10 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline
if (point == masklay->act_point)
immUniformColor3f(1.0f, 1.0f, 1.0f);
else
- immUniformThemeColor(TH_HANDLE_VERTEX_SELECT);
+ immUniformThemeColorShadeAlpha(TH_HANDLE_VERTEX_SELECT, 0, 255);
}
else
- immUniformThemeColor(TH_HANDLE_VERTEX);
+ immUniformThemeColorShadeAlpha(TH_HANDLE_VERTEX, 0, 255);
immBegin(GPU_PRIM_POINTS, 1);
immVertex2fv(pos, vert);
More information about the Bf-blender-cvs
mailing list