[Bf-blender-cvs] [63360df98fb] greasepencil-object: GP: Primitives: Adjust control point styles

[Charlie Jolly]

Commit: 63360df98fb81b79adaf8f7d59f872fd0cc9cb3d
Author: Charlie Jolly
Date:   Wed Dec 12 01:19:01 2018 +0000
Branches: greasepencil-object
https://developer.blender.org/rB63360df98fb81b79adaf8f7d59f872fd0cc9cb3d

GP: Primitives: Adjust control point styles

===================================================================

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 0e2f1c366b3..5a77b176134 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -407,9 +407,11 @@ static void gp_primitive_rectangle(tGPDprimitive *tgpi, 
tGPspoint *points2D)
                }
        }
 
+       mid_v2_v2v2(tgpi->midpoint, tgpi->start, tgpi->end);
        float color[4];
        UI_GetThemeColor4fv(TH_REDALERT, color);
-       gp_primitive_set_cp(tgpi, tgpi->origin, color, 10);
+       gp_primitive_set_cp(tgpi, tgpi->origin, color, SMALL_SIZE_CTL);
+       gp_primitive_set_cp(tgpi, tgpi->midpoint, color, SMALL_SIZE_CTL);
 }
 
 /* create a line */
@@ -483,9 +485,6 @@ 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->start, color, SMALL_SIZE_CTL);
        UI_GetThemeColor4fv(TH_GP_VERTEX_SELECT, color);
        gp_primitive_set_cp(tgpi, tgpi->cp1, color, BIG_SIZE_CTL * 0.9f);
 }
@@ -515,9 +514,6 @@ 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->start, color, SMALL_SIZE_CTL);
        UI_GetThemeColor4fv(TH_GP_VERTEX_SELECT, 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs