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

GP: Change Primitive manipulator to secondary Gizmo color

Browse Source
This commit is contained in:
Antonioya
2018-12-17 16:25:58 +01:00
parent 37d09827c6
commit 4f220cd1cd
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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