[Bf-blender-cvs] [02ba154d6d5] soc-2021-curves: Remove `ed` prefix from ed_curve_toggle_cyclic
Dilith Jayakody
noreply at git.blender.org
Sun Apr 3 17:34:18 CEST 2022
Commit: 02ba154d6d5c655fb9c5e9bad6c93ac61b2ded33
Author: Dilith Jayakody
Date: Wed Mar 16 12:38:44 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB02ba154d6d5c655fb9c5e9bad6c93ac61b2ded33
Remove `ed` prefix from ed_curve_toggle_cyclic
===================================================================
M release/scripts/addons
M source/blender/editors/curve/curve_intern.h
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_pen.c
===================================================================
diff --git a/release/scripts/addons b/release/scripts/addons
index 777653f7d63..df34f4f1db4 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 777653f7d6322a3a651c5ca95ba9f458165b9b48
+Subproject commit df34f4f1db405c5b8deeb03db0937bee9ba81f42
diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h
index 39d58ca06ff..9a09cc8ddb7 100644
--- a/source/blender/editors/curve/curve_intern.h
+++ b/source/blender/editors/curve/curve_intern.h
@@ -134,7 +134,7 @@ void ED_curve_keyindex_update_nurb(struct EditNurb *editnurb, struct Nurb *nu, s
/* exported for editcurve_pen.c */
bool ed_editcurve_extrude(Curve *cu, EditNurb *editnurb, View3D *v3d);
int ed_editcurve_addvert(Curve *cu, EditNurb *editnurb, View3D *v3d, const float location_init[3]);
-bool ed_curve_toggle_cyclic(View3D *v3d, ListBase *editnurb, int direction);
+bool curve_toggle_cyclic(View3D *v3d, ListBase *editnurb, int direction);
void ed_dissolve_bez_segment(BezTriple *bezt_prev,
BezTriple *bezt_next,
const Nurb *nu,
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 1f5f0082355..30d536eca90 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -4748,7 +4748,8 @@ bool ED_curve_editnurb_select_pick_thresholded(bContext *C,
ED_view3d_viewcontext_init(C, &vc, depsgraph);
copy_v2_v2_int(vc.mval, mval);
- const bool found = ED_curve_pick_vert_thresholded(&vc, 1, sel_dist_mul, &nu, &bezt, &bp, &hand, &basact);
+ const bool found = ED_curve_pick_vert_thresholded(
+ &vc, 1, sel_dist_mul, &nu, &bezt, &bp, &hand, &basact);
if ((params->sel_op == SEL_OP_SET) && (found || params->deselect_all)) {
/* Deselect everything. */
@@ -5718,7 +5719,7 @@ void CURVE_OT_extrude(wmOperatorType *ot)
/** \name Make Cyclic Operator
* \{ */
-bool ed_curve_toggle_cyclic(View3D *v3d, ListBase *editnurb, int direction)
+bool curve_toggle_cyclic(View3D *v3d, ListBase *editnurb, int direction)
{
BezTriple *bezt;
BPoint *bp;
@@ -5815,7 +5816,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
}
ListBase *editnurb = object_editcurve_get(obedit);
- if (ed_curve_toggle_cyclic(v3d, editnurb, direction)) {
+ if (curve_toggle_cyclic(v3d, editnurb, direction)) {
changed_multi = true;
WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
DEG_id_tag_update(obedit->data, 0);
diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c
index e866c077eaa..bf22043a339 100644
--- a/source/blender/editors/curve/editcurve_pen.c
+++ b/source/blender/editors/curve/editcurve_pen.c
@@ -1346,7 +1346,7 @@ static bool make_cyclic_if_endpoints(
(bp == nu->bp || bp == nu->bp + nu->pntsu - 1)))) {
View3D *v3d = CTX_wm_view3d(C);
ListBase *nurbs = object_editcurve_get(vc->obedit);
- ed_curve_toggle_cyclic(v3d, nurbs, 0);
+ curve_toggle_cyclic(v3d, nurbs, 0);
return true;
}
}
More information about the Bf-blender-cvs
mailing list