From 9bbe42a4d8621a6034adaaa8636491b8ed66213f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 15 May 2014 18:34:55 +0200 Subject: [PATCH] Mask vertex colors used to be totally ignored --- source/blender/editors/mask/mask_draw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index 5c9df32c6b3..c2b949f6acb 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -213,10 +213,10 @@ static void draw_single_handle(const MaskLayer *mask_layer, const MaskSplinePoin if (point == mask_layer->act_point) glColor3f(1.0f, 1.0f, 1.0f); else - glColor3f(1.0f, 1.0f, 0.0f); + UI_ThemeColor(TH_HANDLE_VERTEX_SELECT); } else { - glColor3f(0.5f, 0.5f, 0.0f); + UI_ThemeColor(TH_HANDLE_VERTEX); } draw_circle(handle_pos[0], handle_pos[1], handle_size, xscale, yscale); @@ -280,10 +280,10 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline if (point == masklay->act_point) glColor3f(1.0f, 1.0f, 1.0f); else - glColor3f(1.0f, 1.0f, 0.0f); + UI_ThemeColor(TH_HANDLE_VERTEX_SELECT); } else { - glColor3f(0.5f, 0.5f, 0.0f); + UI_ThemeColor(TH_HANDLE_VERTEX); } glBegin(GL_POINTS); @@ -346,10 +346,10 @@ static void draw_spline_points(const bContext *C, MaskLayer *masklay, MaskSpline if (point == masklay->act_point) glColor3f(1.0f, 1.0f, 1.0f); else - glColor3f(1.0f, 1.0f, 0.0f); + UI_ThemeColor(TH_HANDLE_VERTEX_SELECT); } else - glColor3f(0.5f, 0.5f, 0.0f); + UI_ThemeColor(TH_HANDLE_VERTEX); glBegin(GL_POINTS); glVertex2fv(vert);