[Bf-blender-cvs] [a62728abeab] greasepencil-object: GP: Remove curve for Lines

Antonioya noreply at git.blender.org
Fri Dec 7 13:28:00 CET 2018


Commit: a62728abeab055c28409424bdb3e0627c36fc098
Author: Antonioya
Date:   Fri Dec 7 13:27:37 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa62728abeab055c28409424bdb3e0627c36fc098

GP: Remove curve for Lines

Lines only have 2 points, so it's not logic.

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

M	release/scripts/startup/bl_ui/space_topbar.py
M	source/blender/editors/gpencil/gpencil_primitive.c

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

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 610a41dd195..900c33103b5 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -375,7 +375,7 @@ class _draw_left_context_mode:
 
                 draw_color_selector()
 
-                if tool.name in {"Line", "Arc", "Bezier"}:
+                if tool.name in {"Arc", "Bezier"}:
                     settings = context.tool_settings.gpencil_sculpt
                     row = layout.row(align=True)
                     row.prop(settings, "use_thickness_curve", text="", icon='CURVE_DATA')
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index d1d21abb5dc..cf1094e4445 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -515,7 +515,7 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
 
 		/* calc pressure */
 		float pressure = 1.0;
-		if (ELEM(tgpi->type, GP_STROKE_LINE, GP_STROKE_ARC, GP_STROKE_BEZIER)) {
+		if (ELEM(tgpi->type, GP_STROKE_ARC, GP_STROKE_BEZIER)) {
 			if ((gset->flag & GP_SCULPT_SETT_FLAG_PRIMITIVE_CURVE) && (gps->totpoints > 1)) {
 				/* normalize value to evaluate curve */
 				float value = (float)i / (gps->totpoints - 1);



More information about the Bf-blender-cvs mailing list