Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_primitive.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_primitive.c17
1 files changed, 11 insertions, 6 deletions
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);
}