diff options
author | Antonioya <blendergit@gmail.com> | 2018-12-17 18:25:58 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2018-12-17 18:26:25 +0300 |
commit | 4f220cd1cd2bba07959cad67cc1e4776531d23ea (patch) | |
tree | 00c0d61b703af839562dfb9415f0de21bb0634f3 | |
parent | 37d09827c607b33174277c1d7860d5290312bb0d (diff) |
GP: Change Primitive manipulator to secondary Gizmo color
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 17 |
2 files changed, 13 insertions, 10 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 d1033a94ffa..0f37e8824ee 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c @@ -404,10 +404,8 @@ GPUBatch *DRW_gpencil_get_buffer_ctrlpoint_geom(bGPdata *gpd) int idx = 0; for (int i = 0; i < gpd->runtime.tot_cp_points; i++) { bGPDcontrolpoint *cp = &cps[i]; - float color[4]; - copy_v3_v3(color, cp->color); - color[3] = 0.8f; - GPU_vertbuf_attr_set(vbo, color_id, idx, color); + + GPU_vertbuf_attr_set(vbo, color_id, idx, cp->color); /* scale size */ float size = cp->size * 0.8f; diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 3b56258b9bd..5c95dbf2a01 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -381,6 +381,7 @@ static void gp_primitive_set_cp(tGPDprimitive *tgpi, float p[2], float color[4], bGPDcontrolpoint *cp = &cp_points[tgpi->gpd->runtime.tot_cp_points]; copy_v2_v2(&cp->x, p); copy_v4_v4(cp->color, color); + color[3] = 0.8f; cp->size = size; tgpi->gpd->runtime.tot_cp_points += 1; } @@ -481,8 +482,9 @@ static void gp_primitive_rectangle(tGPDprimitive *tgpi, tGPspoint *points2D) UI_GetThemeColor4fv(TH_REDALERT, color); gp_primitive_set_cp(tgpi, tgpi->start, color, SMALL_SIZE_CTL); } - else + else { gp_primitive_set_cp(tgpi, tgpi->start, color, BIG_SIZE_CTL); + } UI_GetThemeColor4fv(TH_REDALERT, color); gp_primitive_set_cp(tgpi, tgpi->midpoint, color, SMALL_SIZE_CTL); } @@ -517,8 +519,9 @@ static void gp_primitive_line(tGPDprimitive *tgpi, tGPspoint *points2D) UI_GetThemeColor4fv(TH_REDALERT, color); gp_primitive_set_cp(tgpi, tgpi->start, color, SMALL_SIZE_CTL); } - else + else { gp_primitive_set_cp(tgpi, tgpi->start, color, BIG_SIZE_CTL); + } } /* create an arc */ @@ -555,9 +558,10 @@ static void gp_primitive_arc(tGPDprimitive *tgpi, tGPspoint *points2D) UI_GetThemeColor4fv(TH_REDALERT, color); gp_primitive_set_cp(tgpi, tgpi->start, color, SMALL_SIZE_CTL); } - else + else { gp_primitive_set_cp(tgpi, tgpi->start, color, BIG_SIZE_CTL); - UI_GetThemeColor4fv(TH_GP_VERTEX_SELECT, color); + } + UI_GetThemeColor4fv(TH_GIZMO_SECONDARY, color); gp_primitive_set_cp(tgpi, tgpi->cp1, color, BIG_SIZE_CTL * 0.9f); } @@ -589,9 +593,10 @@ static void gp_primitive_bezier(tGPDprimitive *tgpi, tGPspoint *points2D) UI_GetThemeColor4fv(TH_REDALERT, color); gp_primitive_set_cp(tgpi, tgpi->start, color, SMALL_SIZE_CTL); } - else + else { gp_primitive_set_cp(tgpi, tgpi->start, color, BIG_SIZE_CTL); - UI_GetThemeColor4fv(TH_GP_VERTEX_SELECT, color); + } + UI_GetThemeColor4fv(TH_GIZMO_SECONDARY, color); gp_primitive_set_cp(tgpi, tgpi->cp1, color, BIG_SIZE_CTL * 0.9f); gp_primitive_set_cp(tgpi, tgpi->cp2, color, BIG_SIZE_CTL * 0.9f); } |