diff options
Diffstat (limited to 'source/blender/blenlib/intern/scanfill_utils.c')
-rw-r--r-- | source/blender/blenlib/intern/scanfill_utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 3550854eabd..6bf3c4719f6 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -48,7 +48,7 @@ typedef struct ScanFillIsect { # define EFLAG_CLEAR(eed, val) \ { \ CHECK_TYPE(eed, ScanFillEdge *); \ - (eed)->user_flag = (eed)->user_flag & ~(unsigned int)val; \ + (eed)->user_flag = (eed)->user_flag & ~(uint)val; \ } \ (void)0 #endif @@ -63,7 +63,7 @@ typedef struct ScanFillIsect { # define VFLAG_CLEAR(eve, val) \ { \ CHECK_TYPE(eve, ScanFillVert *); \ - (eve)->user_flags = (eve)->user_flag & ~(unsigned int)val; \ + (eve)->user_flags = (eve)->user_flag & ~(uint)val; \ } \ (void)0 #endif @@ -72,7 +72,7 @@ typedef struct ScanFillIsect { void BLI_scanfill_obj_dump(ScanFillContext *sf_ctx) { FILE *f = fopen("test.obj", "w"); - unsigned int i = 1; + uint i = 1; ScanFillVert *eve; ScanFillEdge *eed; @@ -359,8 +359,8 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx, ListBase *remvertbase, ListBase *remedgebase) { - const unsigned int poly_num = (unsigned int)sf_ctx->poly_nr + 1; - unsigned int eed_index = 0; + const uint poly_num = (uint)sf_ctx->poly_nr + 1; + uint eed_index = 0; int totvert_new = 0; bool changed = false; @@ -378,7 +378,7 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx, poly_info->edge_last = sf_ctx->filledgebase.last; } else { - unsigned short poly_nr; + ushort poly_nr; ScanFillEdge *eed; poly_nr = 0; @@ -407,7 +407,7 @@ bool BLI_scanfill_calc_self_isect(ScanFillContext *sf_ctx, /* self-intersect each polygon */ { - unsigned short poly_nr; + ushort poly_nr; for (poly_nr = 0; poly_nr < poly_num; poly_nr++) { changed |= scanfill_preprocess_self_isect(sf_ctx, poly_info, poly_nr, remedgebase); } |