griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GP: Change Primitive manipulator color

Browse Source
This commit is contained in:
Antonioya
2018-12-17 14:47:58 +01:00
parent bb58354232
commit 9b80c70fc5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
View File

@@ -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 */

10
source/blender/editors/gpencil/gpencil_primitive.c
View File

@@ -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);