From dc0c81337da54f00bed30e7b144f837407740fcc Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 28 Jun 2021 13:47:48 -0500 Subject: Cleanup: Use const arguments --- source/blender/blenkernel/BKE_curve.h | 2 +- source/blender/blenkernel/BKE_mesh.h | 5 +++-- source/blender/blenkernel/intern/curve.c | 2 +- source/blender/blenkernel/intern/mesh_convert.c | 16 +++++----------- 4 files changed, 10 insertions(+), 15 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h index 2687a5ea16c..76a0468df03 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -155,7 +155,7 @@ void BKE_curve_editNurb_free(struct Curve *cu); struct ListBase *BKE_curve_editNurbs_get(struct Curve *cu); void BKE_curve_bevelList_free(struct ListBase *bev); -void BKE_curve_bevelList_make(struct Object *ob, struct ListBase *nurbs, bool for_render); +void BKE_curve_bevelList_make(struct Object *ob, const struct ListBase *nurbs, bool for_render); ListBase BKE_curve_bevel_make(const struct Curve *curve); void BKE_curve_forward_diff_bezier( diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 8ddfb0c8eb2..6d74888b810 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -128,7 +128,8 @@ struct Mesh *BKE_mesh_copy_for_eval(struct Mesh *source, bool reference); /* These functions construct a new Mesh, * contrary to BKE_mesh_from_nurbs which modifies ob itself. */ struct Mesh *BKE_mesh_new_nomain_from_curve(struct Object *ob); -struct Mesh *BKE_mesh_new_nomain_from_curve_displist(struct Object *ob, struct ListBase *dispbase); +struct Mesh *BKE_mesh_new_nomain_from_curve_displist(const struct Object *ob, + const struct ListBase *dispbase); bool BKE_mesh_ensure_facemap_customdata(struct Mesh *me); bool BKE_mesh_clear_facemap_customdata(struct Mesh *me); @@ -151,7 +152,7 @@ int BKE_mesh_nurbs_to_mdata(struct Object *ob, struct MPoly **r_allpoly, int *r_totloop, int *r_totpoly); -int BKE_mesh_nurbs_displist_to_mdata(struct Object *ob, +int BKE_mesh_nurbs_displist_to_mdata(const struct Object *ob, const struct ListBase *dispbase, struct MVert **r_allvert, int *r_totvert, diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 1849ca03b50..341a2b555d8 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -2646,7 +2646,7 @@ void BKE_curve_bevelList_free(ListBase *bev) BLI_listbase_clear(bev); } -void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) +void BKE_curve_bevelList_make(Object *ob, const ListBase *nurbs, const bool for_render) { /* * - convert all curves to polys, with indication of resol and flags for double-vertices diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 934f9ce5018..1b938855291 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -247,7 +247,7 @@ int BKE_mesh_nurbs_to_mdata(Object *ob, /* Initialize mverts, medges and, faces for converting nurbs to mesh and derived mesh */ /* use specified dispbase */ -int BKE_mesh_nurbs_displist_to_mdata(Object *ob, +int BKE_mesh_nurbs_displist_to_mdata(const Object *ob, const ListBase *dispbase, MVert **r_allvert, int *r_totvert, @@ -259,8 +259,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, int *r_totloop, int *r_totpoly) { - Curve *cu = ob->data; - DispList *dl; + const Curve *cu = ob->data; MVert *mvert; MPoly *mpoly; MLoop *mloop; @@ -276,8 +275,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, (ob->type == OB_SURF)); /* count */ - dl = dispbase->first; - while (dl) { + LISTBASE_FOREACH (const DispList *, dl, dispbase) { if (dl->type == DL_SEGM) { totvert += dl->parts * dl->nr; totedge += dl->parts * (dl->nr - 1); @@ -305,7 +303,6 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, totpoly += tot; totloop += tot * 3; } - dl = dl->next; } if (totvert == 0) { @@ -327,8 +324,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, /* verts and faces */ vertcount = 0; - dl = dispbase->first; - while (dl) { + LISTBASE_FOREACH (const DispList *, dl, dispbase) { const bool is_smooth = (dl->rt & CU_SMOOTH) != 0; if (dl->type == DL_SEGM) { @@ -507,8 +503,6 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, } } } - - dl = dl->next; } if (totpoly) { @@ -523,7 +517,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, return 0; } -Mesh *BKE_mesh_new_nomain_from_curve_displist(Object *ob, ListBase *dispbase) +Mesh *BKE_mesh_new_nomain_from_curve_displist(const Object *ob, const ListBase *dispbase) { Mesh *mesh; MVert *allvert; -- cgit v1.2.3