[Bf-blender-cvs] [42fc2cf6fd3] soc-2021-curves: Fix FOREACH_SELECTED_BEZT_BEGIN
Dilith Jayakody
noreply at git.blender.org
Sun Apr 3 17:34:25 CEST 2022
Commit: 42fc2cf6fd328f7b19ff83ee192e9559e5b79b4b
Author: Dilith Jayakody
Date: Sun Apr 3 07:10:16 2022 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB42fc2cf6fd328f7b19ff83ee192e9559e5b79b4b
Fix FOREACH_SELECTED_BEZT_BEGIN
===================================================================
M .clang-format
M source/blender/editors/curve/editcurve_pen.c
===================================================================
diff --git a/.clang-format b/.clang-format
index 41f828787b2..44c8cb90b15 100644
--- a/.clang-format
+++ b/.clang-format
@@ -205,6 +205,7 @@ ForEachMacros:
- FOREACH_SCENE_COLLECTION_BEGIN
- FOREACH_SCENE_OBJECT_BEGIN
- FOREACH_SELECTED_BASE_BEGIN
+ - FOREACH_SELECTED_BEZT_BEGIN
- FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN
- FOREACH_SELECTED_OBJECT_BEGIN
- FOREACH_TRANS_DATA_CONTAINER
diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c
index 98f8bdd805f..1abe6ad1f94 100644
--- a/source/blender/editors/curve/editcurve_pen.c
+++ b/source/blender/editors/curve/editcurve_pen.c
@@ -39,9 +39,10 @@
if (nu->type == CU_BEZIER) { \
for (int i = 0; i < nu->pntsu; i++) { \
BezTriple *bezt = nu->bezt + i; \
- if (BEZT_ISSEL_ANY(bezt) && !bezt->hide)
+ if (BEZT_ISSEL_ANY(bezt) && !bezt->hide) {
#define FOREACH_SELECTED_BEZT_END \
+ } \
} \
} \
BKE_nurb_handles_calc(nu); \
@@ -1106,8 +1107,7 @@ static void extrude_points_from_selected_vertices(const ViewContext *vc,
}
}
- FOREACH_SELECTED_BEZT_BEGIN(bezt, &cu->editnurb->nurbs)
- {
+ FOREACH_SELECTED_BEZT_BEGIN (bezt, &cu->editnurb->nurbs) {
if (bezt) {
bezt->h1 = extrude_handle;
bezt->h2 = extrude_handle;
@@ -1255,8 +1255,7 @@ static void toggle_bezt_free_align_handles(BezTriple *bezt)
*/
static void toggle_sel_bezt_free_align_handles(ListBase *nurbs)
{
- FOREACH_SELECTED_BEZT_BEGIN(bezt, nurbs)
- {
+ FOREACH_SELECTED_BEZT_BEGIN (bezt, nurbs) {
toggle_bezt_free_align_handles(bezt);
}
FOREACH_SELECTED_BEZT_END;
@@ -1314,8 +1313,7 @@ static bool delete_point_under_mouse(ViewContext *vc, const wmEvent *event)
static void move_adjacent_handle(ViewContext *vc, const wmEvent *event, ListBase *nurbs)
{
- FOREACH_SELECTED_BEZT_BEGIN(bezt, nurbs)
- {
+ FOREACH_SELECTED_BEZT_BEGIN (bezt, nurbs) {
BezTriple *adj_bezt;
int bezt_idx;
if (nu->pntsu == 1) {
@@ -1399,8 +1397,7 @@ static bool make_cyclic_if_endpoints(ViewContext *vc,
static void init_selected_bezt_handles(ListBase *nurbs)
{
- FOREACH_SELECTED_BEZT_BEGIN(bezt, nurbs)
- {
+ FOREACH_SELECTED_BEZT_BEGIN (bezt, nurbs) {
bezt->h1 = bezt->h2 = HD_ALIGN;
copy_v3_v3(bezt->vec[0], bezt->vec[1]);
copy_v3_v3(bezt->vec[2], bezt->vec[1]);
More information about the Bf-blender-cvs
mailing list