[Bf-blender-cvs] [08b2d040219] master: Cleanup: Use std::swap instead of macro in C++ code
Hans Goudey
noreply at git.blender.org
Mon Jan 9 17:31:22 CET 2023
Commit: 08b2d0402198366699a3a61baad8715b642f0610
Author: Hans Goudey
Date: Mon Jan 9 11:12:03 2023 -0500
Branches: master
https://developer.blender.org/rB08b2d0402198366699a3a61baad8715b642f0610
Cleanup: Use std::swap instead of macro in C++ code
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.cc
M source/blender/blenkernel/intern/attribute.cc
M source/blender/blenkernel/intern/brush.cc
M source/blender/blenkernel/intern/curve.cc
M source/blender/blenkernel/intern/displist.cc
M source/blender/blenkernel/intern/key.cc
M source/blender/blenkernel/intern/mball_tessellate.cc
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_evaluate.cc
M source/blender/blenkernel/intern/mesh_legacy_convert.cc
M source/blender/blenkernel/intern/paint.cc
M source/blender/blenkernel/intern/scene.cc
M source/blender/blenlib/intern/listbase.cc
M source/blender/blenlib/tests/BLI_math_rotation_test.cc
M source/blender/bmesh/intern/bmesh_mesh.cc
M source/blender/bmesh/intern/bmesh_mesh_normals.cc
M source/blender/compositor/operations/COM_GlareFogGlowOperation.cc
M source/blender/compositor/operations/COM_VectorBlurOperation.cc
M source/blender/draw/engines/eevee_next/eevee_depth_of_field.cc
M source/blender/draw/engines/eevee_next/eevee_film.cc
M source/blender/draw/engines/eevee_next/eevee_velocity.cc
M source/blender/draw/engines/overlay/overlay_motion_path.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
M source/blender/editors/interface/interface.cc
M source/blender/editors/interface/interface_align.cc
M source/blender/editors/interface/interface_anim.cc
M source/blender/editors/interface/interface_handlers.cc
M source/blender/editors/interface/interface_widgets.cc
M source/blender/editors/mesh/editmesh_select.cc
M source/blender/editors/mesh/meshtools.cc
M source/blender/editors/object/object_vgroup.cc
M source/blender/editors/space_image/image_undo.cc
M source/blender/editors/space_node/node_draw.cc
M source/blender/editors/space_node/node_gizmo.cc
M source/blender/editors/space_node/node_relationships.cc
M source/blender/editors/space_view3d/view3d_draw.cc
M source/blender/geometry/intern/mesh_merge_by_distance.cc
M source/blender/geometry/intern/uv_parametrizer.cc
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
M source/blender/modifiers/intern/MOD_screw.cc
M source/blender/render/intern/multires_bake.cc
M source/blender/render/intern/pipeline.cc
M source/blender/windowmanager/intern/wm_event_system.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc
index 8ca569a7726..564cb8e38ef 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@@ -286,7 +286,7 @@ void DM_ensure_looptri_data(DerivedMesh *dm)
BLI_assert(dm->looptris.array_wip == nullptr);
- SWAP(MLoopTri *, dm->looptris.array, dm->looptris.array_wip);
+ std::swap(dm->looptris.array, dm->looptris.array_wip);
if ((looptris_num > dm->looptris.num_alloc) || (looptris_num < dm->looptris.num_alloc * 2) ||
(totpoly == 0)) {
diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc
index 58990c5c024..4e1a925bf5e 100644
--- a/source/blender/blenkernel/intern/attribute.cc
+++ b/source/blender/blenkernel/intern/attribute.cc
@@ -612,7 +612,7 @@ static void get_domains_types(eAttrDomain domains[ATTR_DOMAIN_NUM])
}
/* Swap corner and face. */
- SWAP(eAttrDomain, domains[ATTR_DOMAIN_FACE], domains[ATTR_DOMAIN_CORNER]);
+ std::swap(domains[ATTR_DOMAIN_FACE], domains[ATTR_DOMAIN_CORNER]);
}
int BKE_id_attribute_to_index(const ID *id,
diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc
index 6f1435e90b8..28baa871e12 100644
--- a/source/blender/blenkernel/intern/brush.cc
+++ b/source/blender/blenkernel/intern/brush.cc
@@ -407,7 +407,7 @@ static void brush_undo_preserve(BlendLibReader *reader, ID *id_new, ID *id_old)
/* NOTE: We do not swap IDProperties, as dealing with potential ID pointers in those would be
* fairly delicate. */
- SWAP(IDProperty *, id_new->properties, id_old->properties);
+ std::swap(id_new->properties, id_old->properties);
}
IDTypeInfo IDType_ID_BR = {
diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc
index b510b48870b..f2e6d037fe0 100644
--- a/source/blender/blenkernel/intern/curve.cc
+++ b/source/blender/blenkernel/intern/curve.cc
@@ -704,7 +704,7 @@ Nurb *BKE_nurb_copy(Nurb *src, int pntsu, int pntsv)
*newnu = blender::dna::shallow_copy(*src);
if (pntsu == 1) {
- SWAP(int, pntsu, pntsv);
+ std::swap(pntsu, pntsv);
}
newnu->pntsu = pntsu;
newnu->pntsv = pntsv;
@@ -3048,7 +3048,7 @@ void BKE_curve_bevelList_make(Object *ob, const ListBase *nurbs, const bool for_
bevp2 = bevp1 + (bl->nr - 1);
nr = bl->nr / 2;
while (nr--) {
- SWAP(BevPoint, *bevp1, *bevp2);
+ std::swap( *bevp1, *bevp2);
bevp1++;
bevp2--;
}
@@ -4437,7 +4437,7 @@ void BKE_nurb_direction_switch(Nurb *nu)
a /= 2;
while (a > 0) {
if (bezt1 != bezt2) {
- SWAP(BezTriple, *bezt1, *bezt2);
+ std::swap(*bezt1, *bezt2);
}
swap_v3_v3(bezt1->vec[0], bezt1->vec[2]);
@@ -4446,12 +4446,12 @@ void BKE_nurb_direction_switch(Nurb *nu)
swap_v3_v3(bezt2->vec[0], bezt2->vec[2]);
}
- SWAP(uint8_t, bezt1->h1, bezt1->h2);
- SWAP(uint8_t, bezt1->f1, bezt1->f3);
+ std::swap( bezt1->h1, bezt1->h2);
+ std::swap( bezt1->f1, bezt1->f3);
if (bezt1 != bezt2) {
- SWAP(uint8_t, bezt2->h1, bezt2->h2);
- SWAP(uint8_t, bezt2->f1, bezt2->f3);
+ std::swap( bezt2->h1, bezt2->h2);
+ std::swap( bezt2->f1, bezt2->f3);
bezt1->tilt = -bezt1->tilt;
bezt2->tilt = -bezt2->tilt;
}
@@ -4469,7 +4469,7 @@ void BKE_nurb_direction_switch(Nurb *nu)
bp2 = bp1 + (a - 1);
a /= 2;
while (bp1 != bp2 && a > 0) {
- SWAP(BPoint, *bp1, *bp2);
+ std::swap( *bp1, *bp2);
a--;
bp1->tilt = -bp1->tilt;
bp2->tilt = -bp2->tilt;
@@ -4491,7 +4491,7 @@ void BKE_nurb_direction_switch(Nurb *nu)
fp2 = fp1 + (a - 1);
a /= 2;
while (fp1 != fp2 && a > 0) {
- SWAP(float, *fp1, *fp2);
+ std::swap( *fp1, *fp2);
a--;
fp1++;
fp2--;
@@ -4530,7 +4530,7 @@ void BKE_nurb_direction_switch(Nurb *nu)
a /= 2;
while (bp1 != bp2 && a > 0) {
- SWAP(BPoint, *bp1, *bp2);
+ std::swap( *bp1, *bp2);
a--;
bp1++;
bp2--;
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index 2e285170b93..8cdcb85a033 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -1090,7 +1090,7 @@ static void calc_bevfac_mapping(const Curve *cu,
}
if (end < *r_start || (end == *r_start && *r_lastblend < 1.0f - *r_firstblend)) {
- SWAP(int, *r_start, end);
+ std::swap(*r_start, end);
tmpf = *r_lastblend;
*r_lastblend = 1.0f - *r_firstblend;
*r_firstblend = 1.0f - tmpf;
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index b19ad6a3e97..f8d7f822e7d 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -2547,7 +2547,7 @@ bool BKE_keyblock_move(Object *ob, int org_index, int new_index)
BLI_listbase_swaplinks(&key->block, kb, other_kb);
/* Swap absolute positions. */
- SWAP(float, kb->pos, other_kb->pos);
+ std::swap(kb->pos, other_kb->pos);
kb = other_kb;
}
diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc
index c2322da19cb..1e3519847fe 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.cc
+++ b/source/blender/blenkernel/intern/mball_tessellate.cc
@@ -181,7 +181,7 @@ static uint partition_mainb(MetaElem **mainb, uint start, uint end, uint s, floa
break;
}
- SWAP(MetaElem *, mainb[i], mainb[j]);
+ std::swap(mainb[i], mainb[j]);
i++;
j--;
}
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index a7f1eb1df00..30ed0e2ad02 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -1746,7 +1746,7 @@ void BKE_mesh_mselect_active_set(Mesh *me, int index, int type)
}
else if (msel_index != me->totselect - 1) {
/* move to the end */
- SWAP(MSelect, me->mselect[msel_index], me->mselect[me->totselect - 1]);
+ std::swap(me->mselect[msel_index], me->mselect[me->totselect - 1]);
}
BLI_assert((me->mselect[me->totselect - 1].index == index) &&
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc
index de080c9dff2..3df25464e34 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.cc
+++ b/source/blender/blenkernel/intern/mesh_evaluate.cc
@@ -542,8 +542,8 @@ void BKE_mesh_mdisp_flip(MDisps *md, const bool use_loop_mdisp_flip)
co_b = co[x * sides + y];
swap_v3_v3(co_a, co_b);
- SWAP(float, co_a[0], co_a[1]);
- SWAP(float, co_b[0], co_b[1]);
+ std::swap(co_a[0], co_a[1]);
+ std::swap(co_b[0], co_b[1]);
if (use_loop_mdisp_flip) {
co_a[2] *= -1.0f;
@@ -553,7 +553,7 @@ void BKE_mesh_mdisp_flip(MDisps *md, const bool use_loop_mdisp_flip)
co_a = co[x * sides + x];
- SWAP(float, co_a[0], co_a[1]);
+ std::swap(co_a[0], co_a[1]);
if (use_loop_mdisp_flip) {
co_a[2] *= -1.0f;
@@ -588,10 +588,10 @@ void BKE_mesh_polygon_flip_ex(const MPoly *mpoly,
for (loopstart++; loopend > loopstart; loopstart++, loopend--) {
mloop[loopend].e = mloop[loopend - 1].e;
- SWAP(uint, mloop[loopstart].e, prev_edge_index);
+ std::swap(mloop[loopstart].e, prev_edge_index);
if (!loops_in_ldata) {
- SWAP(MLoop, mloop[loopstart], mloop[loopend]);
+ std::swap(mloop[loopstart], mloop[loopend]);
}
if (lnors) {
swap_v3_v3(lnors[loopstart], lnors[loopend]);
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index 7d4f0f8f7f8..3dce2d8b136 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -158,7 +158,7 @@ static void mesh_calc_edges_mdata(const MVert * /*allvert*/,
/* order is swapped so extruding this edge as a surface won't flip face normals
* with cyclic curves */
if (ed->v1 + 1 != ed->v2) {
- SWAP(uint, med->v1, med->v2);
+ std::swap(med->v1, med->v2);
}
med++;
}
@@ -912,8 +912,8 @@ int BKE_mesh_mface_index_validate(MFace *mface, CustomData *fdata, int mfindex,
if (mface->v3 == 0) {
static int corner_indices[4] = {1, 2, 0, 3};
- SWAP(uint, mface->v1, mface->v2);
- SWAP(uint, mface->v2, mface->v3);
+ std::swap(mface->v1, mface->v2);
+ std::swap(mface->v2, mface->v3);
if (fdata) {
CustomData_swap_corners(fdata, mfindex, corner_indices);
@@ -924,8 +924,8 @@ int BKE_mesh_mface_index_validate(MFace *mface, CustomData *fdata, int mfindex,
if (mface->v3 == 0 || mface->v4 == 0) {
static int corner_indices[4] = {2, 3, 0, 1};
- SWAP(uint, mface->v1, mface->v3);
- SWAP(uint, mface->v2, mface->v4);
+ std::swap(mface->v1, mface->v3);
+ std::swap(mface->v2, mface->v4);
if (fdata) {
CustomData_swap_corners(fdata, mfindex, corner_indices);
diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc
index acc6a32b0eb..1f7dc7071c2 100644
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@ -128,7 +128,7 @@ static void palette_undo_preserve(BlendLibReader * /*reader*/, ID *id_new, ID *i
/* NOTE: We do not swap IDProperties, as dealing with potential ID pointers in those would be
* fairly delicate. */
BKE_lib_id_swap(nullptr, id_new, id_old);
- SWAP(IDProperty *, id_new->properties, id_old->properties);
+ std::swap(id_new->properties, id_old->properties);
}
IDTypeInfo IDType_ID_PAL = {
@@ -1080,7 +1080,7 @@ bool BKE_paint_ensure(ToolSettings *ts, Paint **r_paint)
Paint paint_test = **r_paint;
BKE_paint_runtime_init(ts, *r_paint);
/* Swap so debu
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list