[Bf-blender-cvs] [4886ab72ef8] greasepencil-object: GP: Test moving origin point to start control point for Arcs and Curves
Antonioya
noreply at git.blender.org
Tue Dec 11 17:37:38 CET 2018
Commit: 4886ab72ef8377f987959c60c50e4959e3046647
Author: Antonioya
Date: Tue Dec 11 17:37:28 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB4886ab72ef8377f987959c60c50e4959e3046647
GP: Test moving origin point to start control point for Arcs and Curves
===================================================================
M source/blender/editors/gpencil/gpencil_primitive.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 78d00abc0b7..ff4828a9de6 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -489,8 +489,9 @@ static void gp_primitive_arc(tGPDprimitive *tgpi, tGPspoint *points2D)
UI_GetThemeColor4fv(TH_ACTIVE_VERT, color);
gp_primitive_set_cp(tgpi, tgpi->start, color, BIG_SIZE_CTL);
gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL);
+ /* origin point follows start control point */
UI_GetThemeColor4fv(TH_REDALERT, color);
- gp_primitive_set_cp(tgpi, tgpi->origin, color, SMALL_SIZE_CTL);
+ gp_primitive_set_cp(tgpi, tgpi->start, color, SMALL_SIZE_CTL);
}
/* create a bezier */
@@ -518,11 +519,13 @@ static void gp_primitive_bezier(tGPDprimitive *tgpi, tGPspoint *points2D)
UI_GetThemeColor4fv(TH_ACTIVE_VERT, color);
gp_primitive_set_cp(tgpi, tgpi->start, color, BIG_SIZE_CTL);
gp_primitive_set_cp(tgpi, tgpi->end, color, BIG_SIZE_CTL);
+ /* origin point follows start control point */
UI_GetThemeColor4fv(TH_REDALERT, color);
- gp_primitive_set_cp(tgpi, tgpi->origin, color, SMALL_SIZE_CTL);
+ gp_primitive_set_cp(tgpi, tgpi->start, color, SMALL_SIZE_CTL);
+
UI_GetThemeColor4fv(TH_GP_VERTEX_SELECT, color);
- gp_primitive_set_cp(tgpi, tgpi->cp1, color, BIG_SIZE_CTL);
- gp_primitive_set_cp(tgpi, tgpi->cp2, color, BIG_SIZE_CTL);
+ 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);
}
/* create a circle */
More information about the Bf-blender-cvs
mailing list