blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: compiler warnings

This commit is contained in:
Campbell Barton 2022-04-04 12:20:56 +10:00
parent 637fe6f5ff
commit f6a20fca5e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/curve/curve_intern.h
View File

@ -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,

8
source/blender/editors/curve/editcurve.c
View File

@ -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,

2
source/blender/editors/curve/editcurve_pen.c
View File

@ -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);

2
source/blender/editors/interface/interface_utils.cc
View File

@ -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);
}