From 9b80c70fc5be1e054c470265d1cb6c7b00eb7b67 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Mon, 17 Dec 2018 14:47:58 +0100 Subject: GP: Change Primitive manipulator color --- source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c | 2 +- source/blender/editors/gpencil/gpencil_primitive.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c index a098fb74bc8..d1033a94ffa 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c @@ -406,7 +406,7 @@ GPUBatch *DRW_gpencil_get_buffer_ctrlpoint_geom(bGPdata *gpd) bGPDcontrolpoint *cp = &cps[i]; float color[4]; copy_v3_v3(color, cp->color); - color[3] = 0.5f; + color[3] = 0.8f; GPU_vertbuf_attr_set(vbo, color_id, idx, color); /* scale size */ diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index e32639b1039..3b56258b9bd 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -475,7 +475,7 @@ static void gp_primitive_rectangle(tGPDprimitive *tgpi, tGPspoint *points2D) mid_v2_v2v2(tgpi->midpoint, tgpi->start, tgpi->end); float color[4]; - UI_GetThemeColor4fv(TH_ACTIVE_VERT, color); + UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color); gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL); if (tgpi->tot_stored_edges) { UI_GetThemeColor4fv(TH_REDALERT, color); @@ -511,7 +511,7 @@ static void gp_primitive_line(tGPDprimitive *tgpi, tGPspoint *points2D) } } float color[4]; - UI_GetThemeColor4fv(TH_ACTIVE_VERT, color); + UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color); gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL); if (tgpi->tot_stored_edges) { UI_GetThemeColor4fv(TH_REDALERT, color); @@ -549,7 +549,7 @@ static void gp_primitive_arc(tGPDprimitive *tgpi, tGPspoint *points2D) a += step; } float color[4]; - UI_GetThemeColor4fv(TH_ACTIVE_VERT, color); + UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color); gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL); if (tgpi->tot_stored_edges) { UI_GetThemeColor4fv(TH_REDALERT, color); @@ -583,7 +583,7 @@ static void gp_primitive_bezier(tGPDprimitive *tgpi, tGPspoint *points2D) a += step; } float color[4]; - UI_GetThemeColor4fv(TH_ACTIVE_VERT, color); + UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color); gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL); if (tgpi->tot_stored_edges) { UI_GetThemeColor4fv(TH_REDALERT, color); @@ -617,7 +617,7 @@ static void gp_primitive_circle(tGPDprimitive *tgpi, tGPspoint *points2D) a += step; } float color[4]; - UI_GetThemeColor4fv(TH_ACTIVE_VERT, color); + UI_GetThemeColor4fv(TH_GIZMO_PRIMARY, color); gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL); gp_primitive_set_cp(tgpi, tgpi->start, color, BIG_SIZE_CTL); UI_GetThemeColor4fv(TH_REDALERT, color); -- cgit v1.2.3