[Bf-blender-cvs] [73d36710db8] soc-2021-curves: Reverted mid vertex extrude prevention

dilithjay noreply at git.blender.org
Wed Sep 1 08:07:20 CEST 2021


Commit: 73d36710db8bac114e4a04d290e82281aa45cde9
Author: dilithjay
Date:   Sat Aug 28 08:23:29 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB73d36710db8bac114e4a04d290e82281aa45cde9

Reverted mid vertex extrude prevention

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

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

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

diff --git a/release/scripts/addons b/release/scripts/addons
index fe12f8b9758..53c7859c913 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit fe12f8b97589baf56bf02a53cd73fc495a89909f
+Subproject commit 53c7859c9135eeb5274008d4d6caa8364ea0c308
diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c
index 5f10c9f96d9..e795fd06d73 100644
--- a/source/blender/editors/curve/editcurve_pen.c
+++ b/source/blender/editors/curve/editcurve_pen.c
@@ -833,24 +833,6 @@ static bool make_cyclic_if_endpoints(
   return false;
 }
 
-/* Deselect all points except the end points. */
-static void deselect_except_end_points(Nurb *nu, EditNurb *editnurb)
-{
-  BezTriple *start_bezt = nu->bezt;
-  BezTriple *last_bezt = nu->bezt + nu->pntsu - 1;
-  bool temp_handle_sel1[3] = {start_bezt->f1, start_bezt->f2, start_bezt->f3};
-  bool temp_handle_sel2[3] = {last_bezt->f1, last_bezt->f2, last_bezt->f3};
-
-  ED_curve_deselect_all(editnurb);
-
-  start_bezt->f1 = temp_handle_sel1[0];
-  start_bezt->f2 = temp_handle_sel1[1];
-  start_bezt->f3 = temp_handle_sel1[2];
-  last_bezt->f1 = temp_handle_sel2[0];
-  last_bezt->f2 = temp_handle_sel2[1];
-  last_bezt->f3 = temp_handle_sel2[2];
-}
-
 enum {
   PEN_MODAL_CANCEL = 1,
   PEN_MODAL_FREE_MOVE_HANDLE,
@@ -1020,14 +1002,6 @@ static int curve_pen_modal(bContext *C, wmOperator *op, const wmEvent *event)
             moving_segment = true;
           }
           else {
-            if (nu) {
-              if (!(nu->flagu & CU_NURB_CYCLIC)) {
-                deselect_except_end_points(nu, cu->editnurb);
-              }
-              else {
-                ED_curve_deselect_all(cu->editnurb);
-              }
-            }
             add_vertex_connected_to_selected_vertex(&vc, obedit, event);
           }
         }



More information about the Bf-blender-cvs mailing list