diff options
| author | Campbell Barton <campbell@blender.org> | 2022-04-04 05:20:56 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-04-04 05:35:33 +0300 |
| commit | f6a20fca5ed841c5276b35da87d02b3be9db6f85 (patch) | |
| tree | c0be59bcaa28044ac3b2ea0a6d8cf1943cf13eb7 | |
| parent | 637fe6f5ff9c8f09bdbd8e37f6d67b29e79b4a39 (diff) | |
Cleanup: compiler warnings
| -rw-r--r-- | source/blender/editors/curve/curve_intern.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/curve/editcurve_pen.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_utils.cc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index 09a0dbc541f..c96b75ff3e7 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -138,8 +138,8 @@ void ed_dissolve_bez_segment(BezTriple *bezt_prev, BezTriple *bezt_next, const Nurb *nu, const Curve *cu, - const int span_len, - const int span_step[2]); + const uint span_len, + const uint span_step[2]); /* helper functions */ void ed_editnurb_translate_flag(struct ListBase *editnurb, diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index c7c2468a6e4..58ee5ccae64 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6512,8 +6512,8 @@ void ed_dissolve_bez_segment(BezTriple *bezt_prev, BezTriple *bezt_next, const Nurb *nu, const Curve *cu, - const int span_len, - const int span_step[2]) + const uint span_len, + const uint span_step[2]) { int i_span_edge_len = span_len + 1; const int dims = 3; @@ -6593,8 +6593,8 @@ static int curve_dissolve_exec(bContext *C, wmOperator *UNUSED(op)) LISTBASE_FOREACH (Nurb *, nu, editnurb) { if ((nu->type == CU_BEZIER) && (nu->pntsu > 2)) { - int span_step[2] = {nu->pntsu, nu->pntsu}; - int span_len; + uint span_step[2] = {nu->pntsu, nu->pntsu}; + uint span_len; while (BLI_array_iter_span(nu->bezt, nu->pntsu, diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c index a848fdb56ca..9f623651c8c 100644 --- a/source/blender/editors/curve/editcurve_pen.c +++ b/source/blender/editors/curve/editcurve_pen.c @@ -1288,7 +1288,7 @@ static bool delete_point_under_mouse(ViewContext *vc, const wmEvent *event) BezTriple *prev_bezt = BKE_nurb_bezt_get_prev(nu, bezt); if (next_bezt && prev_bezt) { const int bez_index = BKE_curve_nurb_vert_index_get(nu, bezt); - const int span_step[2] = {bez_index, bez_index}; + const uint span_step[2] = {bez_index, bez_index}; ed_dissolve_bez_segment(prev_bezt, next_bezt, nu, cu, 1, span_step); } delete_bezt_from_nurb(bezt, nu, editnurb); diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index b796f07c24b..56d80b8e557 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -489,7 +489,7 @@ static bool add_collection_search_item(CollItemSearch *cis, cis->name, cis->data, cis->iconid, - cis->has_sep_char ? UI_BUT_HAS_SEP_CHAR : 0, + cis->has_sep_char ? (int)UI_BUT_HAS_SEP_CHAR : 0, name_prefix_offset); } |