[Bf-blender-cvs] [a088285d426] soc-2021-curves: Curve Pen: Make cyclic only if more than 2 points

dilithjay noreply at git.blender.org
Wed Aug 25 05:27:33 CEST 2021


Commit: a088285d426f5864343d414d824b654bbb76bef3
Author: dilithjay
Date:   Wed Aug 25 08:57:09 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBa088285d426f5864343d414d824b654bbb76bef3

Curve Pen: Make cyclic only if more than 2 points

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/editors/curve/editcurve_pen.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 357d7f74796..3fc3c6a0f5d 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 357d7f74796f713a6d1e2d88297e38b5b4bd099c
+Subproject commit 3fc3c6a0f5df6980c194deca437bd3454c077a96
diff --git a/release/scripts/addons b/release/scripts/addons
index 5d5b7489027..fe12f8b9758 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5d5b7489027a5c833e47af1f185ac28b401615e4
+Subproject commit fe12f8b97589baf56bf02a53cd73fc495a89909f
diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c
index 7f2e0e87af3..7bfa63aebb4 100644
--- a/source/blender/editors/curve/editcurve_pen.c
+++ b/source/blender/editors/curve/editcurve_pen.c
@@ -984,7 +984,7 @@ static int curve_pen_modal(bContext *C, wmOperator *op, const wmEvent *event)
         if (found_point) {
           copy_v2_v2_int(vc.mval, event->mval);
           if (nu && !(nu->flagu & CU_NURB_CYCLIC)) {
-            bool closed = make_cyclic_if_endpoints(nu, bezt, bp, &vc, C);
+            bool closed = nu->pntsu > 2 && make_cyclic_if_endpoints(nu, bezt, bp, &vc, C);
 
             /* Set "new" to true to be able to click and drag to control handles when added. */
             RNA_boolean_set(op->ptr, "new", closed);
diff --git a/source/tools b/source/tools
index 08de10dbd82..ffc34f850b4 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 08de10dbd8234c242b1896a6813d2a6335288e74
+Subproject commit ffc34f850b479ae78202cd62f80703d1a56c342f



More information about the Bf-blender-cvs mailing list