diff options
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect_nonplanar.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dupe.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_fill_attribute.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_fill_grid.c | 20 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_fill_holes.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_inset.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 12 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_primitive.c | 8 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_smooth_laplacian.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide_edgering.c | 26 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_triangulate.c | 10 |
14 files changed, 53 insertions, 53 deletions
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index 5c9cd8dc3fa..c5c4ac959a9 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -55,7 +55,7 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f, const bool check_degenera BMLoop *l_tag_prev = NULL, *l_tag_first = NULL; BMLoop *l_iter, *l_first; - unsigned int i; + uint i; STACK_INIT(loops_split, pair_split_max); STACK_INIT(verts_pair, pair_split_max); diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c b/source/blender/bmesh/operators/bmo_connect_nonplanar.c index b8acc9d09b8..67590fe8ef9 100644 --- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c +++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c @@ -67,8 +67,8 @@ static bool bm_face_split_find(BMesh *bm, BMFace *f, BMLoop *l_pair[2], float *r { BMLoop *l_iter, *l_first; BMLoop **l_arr = BLI_array_alloca(l_arr, f->len); - const unsigned int f_len = f->len; - unsigned int i_a, i_b; + const uint f_len = f->len; + uint i_a, i_b; bool found = false; /* angle finding */ diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 6e3a8a1473d..2df8e73c2b8 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -309,7 +309,7 @@ void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op) BMO_ITER (e, &eiter, op->slots_in, "edges", BM_EDGE) { BMFace *f_pair[2]; if (BM_edge_face_pair(e, &f_pair[0], &f_pair[1])) { - unsigned int j; + uint j; for (j = 0; j < 2; j++) { BMLoop *l_first, *l_iter; l_iter = l_first = BM_FACE_FIRST_LOOP(f_pair[j]); diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c index 8048add84d4..e35c1f3b66c 100644 --- a/source/blender/bmesh/operators/bmo_dupe.c +++ b/source/blender/bmesh/operators/bmo_dupe.c @@ -83,7 +83,7 @@ static BMEdge *bmo_edge_copy( { BMEdge *e_dst; BMVert *e_dst_v1, *e_dst_v2; - unsigned int rlen; + uint rlen; /* see if any of the neighboring faces are * not being duplicated. in that case, diff --git a/source/blender/bmesh/operators/bmo_fill_attribute.c b/source/blender/bmesh/operators/bmo_fill_attribute.c index 233ed746ed4..dcf2570dff4 100644 --- a/source/blender/bmesh/operators/bmo_fill_attribute.c +++ b/source/blender/bmesh/operators/bmo_fill_attribute.c @@ -91,7 +91,7 @@ static void bm_face_copy_shared_all( /** * Flood fill attributes. */ -static unsigned int bmesh_face_attribute_fill( +static uint bmesh_face_attribute_fill( BMesh *bm, const bool use_normals, const bool use_data) { @@ -102,7 +102,7 @@ static unsigned int bmesh_face_attribute_fill( BMIter iter; BMLoop *l; - unsigned int face_tot = 0; + uint face_tot = 0; BLI_LINKSTACK_INIT(loop_queue_prev); diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index 04ae915b707..dc4ebf50754 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -187,15 +187,15 @@ static void bm_loop_interp_from_grid_boundary_2(BMesh *bm, BMLoop *l, BMLoop *l_ * Avoids calling #barycentric_weights_v2_quad often by caching weights into an array. */ static void barycentric_weights_v2_grid_cache( - const unsigned int xtot, const unsigned int ytot, + const uint xtot, const uint ytot, float (*weight_table)[4]) { float x_step = 1.0f / (float)(xtot - 1); float y_step = 1.0f / (float)(ytot - 1); - unsigned int i = 0; + uint i = 0; float xy_fl[2]; - unsigned int x, y; + uint x, y; for (y = 0; y < ytot; y++) { xy_fl[1] = y_step * (float)y; for (x = 0; x < xtot; x++) { @@ -219,13 +219,13 @@ static void barycentric_weights_v2_grid_cache( * \param v_grid 2d array of verts, all boundary verts must be set, we fill in the middle. */ static void bm_grid_fill_array( - BMesh *bm, BMVert **v_grid, const unsigned int xtot, unsigned const int ytot, + BMesh *bm, BMVert **v_grid, const uint xtot, unsigned const int ytot, const short mat_nr, const bool use_smooth, const bool use_flip, const bool use_interp_simple) { const bool use_vert_interp = CustomData_has_interp(&bm->vdata); const bool use_loop_interp = CustomData_has_interp(&bm->ldata); - unsigned int x, y; + uint x, y; /* for use_loop_interp */ BMLoop *((*larr_x_a)[2]), *((*larr_x_b)[2]), *((*larr_y_a)[2]), *((*larr_y_b)[2]); @@ -393,7 +393,7 @@ static void bm_grid_fill_array( BMLoop *l_quad[4]; BMLoop *l_bound[4]; BMLoop *l_tmp; - unsigned int x_side, y_side, i; + uint x_side, y_side, i; char interp_from; @@ -496,12 +496,12 @@ static void bm_grid_fill( { #define USE_FLIP_DETECT - const unsigned int xtot = (unsigned int)BM_edgeloop_length_get(estore_a); - const unsigned int ytot = (unsigned int)BM_edgeloop_length_get(estore_rail_a); + const uint xtot = (uint)BM_edgeloop_length_get(estore_a); + const uint ytot = (uint)BM_edgeloop_length_get(estore_rail_a); //BMVert *v; - unsigned int i; + uint i; #ifdef DEBUG - unsigned int x, y; + uint x, y; #endif LinkData *el; bool use_flip = false; diff --git a/source/blender/bmesh/operators/bmo_fill_holes.c b/source/blender/bmesh/operators/bmo_fill_holes.c index eadfbdb1aa8..869994a98b9 100644 --- a/source/blender/bmesh/operators/bmo_fill_holes.c +++ b/source/blender/bmesh/operators/bmo_fill_holes.c @@ -36,7 +36,7 @@ void bmo_holes_fill_exec(BMesh *bm, BMOperator *op) { BMOperator op_attr; - const unsigned int sides = BMO_slot_int_get(op->slots_in, "sides"); + const uint sides = BMO_slot_int_get(op->slots_in, "sides"); BM_mesh_elem_hflag_disable_all(bm, BM_EDGE | BM_FACE, BM_ELEM_TAG, false); diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index f0796e425fa..a64c6d74a93 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -275,7 +275,7 @@ static void bmo_face_inset_individual( BMLoop *l_iter, *l_first; BMLoop *l_other; - unsigned int i; + uint i; float e_length_prev; l_first = BM_FACE_FIRST_LOOP(f); diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index 655fb346976..69198ff35ab 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -132,11 +132,11 @@ struct DelimitData_CD { }; struct DelimitData { - unsigned int do_seam : 1; - unsigned int do_sharp : 1; - unsigned int do_mat : 1; - unsigned int do_angle_face : 1; - unsigned int do_angle_shape : 1; + uint do_seam : 1; + uint do_sharp : 1; + uint do_mat : 1; + uint do_angle_face : 1; + uint do_angle_shape : 1; float angle_face; float angle_face__cos; @@ -272,7 +272,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op) /* data: edge-to-join, sort_value: error weight */ struct SortPointerByFloat *jedges; unsigned i, totedge; - unsigned int totedge_tag = 0; + uint totedge_tag = 0; struct DelimitData delimit_data = {0}; diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index e5c3ff7a088..039a215bdc5 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -760,8 +760,8 @@ void bmo_create_grid_exec(BMesh *bm, BMOperator *op) BMOpSlot *slot_verts_out = BMO_slot_get(op->slots_out, "verts.out"); const float dia = BMO_slot_float_get(op->slots_in, "size"); - const unsigned int xtot = max_ii(2, BMO_slot_int_get(op->slots_in, "x_segments")); - const unsigned int ytot = max_ii(2, BMO_slot_int_get(op->slots_in, "y_segments")); + const uint xtot = max_ii(2, BMO_slot_int_get(op->slots_in, "x_segments")); + const uint ytot = max_ii(2, BMO_slot_int_get(op->slots_in, "y_segments")); const float xtot_inv2 = 2.0f / (xtot - 1); const float ytot_inv2 = 2.0f / (ytot - 1); const bool calc_uvs = BMO_slot_bool_get(op->slots_in, "calc_uvs"); @@ -772,7 +772,7 @@ void bmo_create_grid_exec(BMesh *bm, BMOperator *op) float mat[4][4]; float vec[3], tvec[3]; - unsigned int x, y, i; + uint x, y, i; BMO_slot_mat4_get(op->slots_in, "matrix", mat); @@ -826,7 +826,7 @@ void bmo_create_grid_exec(BMesh *bm, BMOperator *op) * \param y_segments The y-resolution of the grid * \param oflag The flag to check faces with. */ -void BM_mesh_calc_uvs_grid(BMesh *bm, const unsigned int x_segments, const unsigned int y_segments, const short oflag) +void BM_mesh_calc_uvs_grid(BMesh *bm, const uint x_segments, const uint y_segments, const short oflag) { BMFace *f; BMLoop *l; diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 0ad8247e539..18704a6679f 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -153,7 +153,7 @@ static BMFace *remdoubles_createface(BMesh *bm, BMFace *f, BMOpSlot *slot_target finally: { - unsigned int i; + uint i; for (i = 0; i < STACK_SIZE(verts); i++) { BMO_vert_flag_disable(bm, verts[i], VERT_IN_FACE); } @@ -165,7 +165,7 @@ finally: BLI_assert(f_new != f); if (f_new) { - unsigned int i = 0; + uint i = 0; BMLoop *l_iter, *l_first; l_iter = l_first = BM_FACE_FIRST_LOOP(f_new); do { @@ -469,7 +469,7 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op) v_tar = e->v1; while (!BLI_stack_is_empty(edge_stack)) { - unsigned int j; + uint j; BLI_stack_pop(edge_stack, &e); for (j = 0; j < 2; j++) { diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c index 1a83bafc074..2a7b85ac8fd 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c @@ -172,7 +172,7 @@ static void init_laplacian_matrix(LaplacianSystem *sys) float w1, w2, w3, w4; int i, j; bool has_4_vert; - unsigned int idv1, idv2, idv3, idv4, idv[4]; + uint idv1, idv2, idv3, idv4, idv[4]; BMEdge *e; BMFace *f; BMIter eiter; @@ -289,7 +289,7 @@ static void fill_laplacian_matrix(LaplacianSystem *sys) float w2, w3, w4; int i, j; bool has_4_vert; - unsigned int idv1, idv2, idv3, idv4, idv[4]; + uint idv1, idv2, idv3, idv4, idv[4]; BMEdge *e; BMFace *f; @@ -420,7 +420,7 @@ static void validate_solution(LaplacianSystem *sys, int usex, int usey, int usez float leni, lene; float vini, vend; float *vi1, *vi2, ve1[3], ve2[3]; - unsigned int idv1, idv2; + uint idv1, idv2; BMOIter siter; BMVert *v; BMEdge *e; diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index ce031e1c230..94b60a51f68 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -66,7 +66,7 @@ /* Specialized Utility Funcs */ #ifndef NDEBUG -static unsigned int bm_verts_tag_count(BMesh *bm) +static uint bm_verts_tag_count(BMesh *bm) { int count = 0; BMIter iter; @@ -390,9 +390,9 @@ static void bm_vert_calc_surface_tangent(BMesh *bm, BMVert *v, float r_no[3]) * Tag faces connected to an edge loop as FACE_SHARED * if all vertices are VERT_SHARED. */ -static void bm_faces_share_tag_flush(BMesh *bm, BMEdge **e_arr, const unsigned int e_arr_len) +static void bm_faces_share_tag_flush(BMesh *bm, BMEdge **e_arr, const uint e_arr_len) { - unsigned int i; + uint i; for (i = 0; i < e_arr_len; i++) { BMEdge *e = e_arr[i]; @@ -412,9 +412,9 @@ static void bm_faces_share_tag_flush(BMesh *bm, BMEdge **e_arr, const unsigned i /** * Un-Tag faces connected to an edge loop, clearing FACE_SHARED */ -static void bm_faces_share_tag_clear(BMesh *bm, BMEdge **e_arr_iter, const unsigned int e_arr_len_iter) +static void bm_faces_share_tag_clear(BMesh *bm, BMEdge **e_arr_iter, const uint e_arr_len_iter) { - unsigned int i; + uint i; for (i = 0; i < e_arr_len_iter; i++) { BMEdge *e = e_arr_iter[i]; @@ -454,16 +454,16 @@ static LoopPairStore *bm_edgering_pair_store_create( LoopPairStore *lpair = MEM_mallocN(sizeof(*lpair), __func__); if (interp_mode == SUBD_RING_INTERP_SURF) { - const unsigned int len_a = BM_edgeloop_length_get(el_store_a); - const unsigned int len_b = BM_edgeloop_length_get(el_store_b); - const unsigned int e_arr_a_len = len_a - (BM_edgeloop_is_closed(el_store_a) ? 0 : 1); - const unsigned int e_arr_b_len = len_b - (BM_edgeloop_is_closed(el_store_b) ? 0 : 1); + const uint len_a = BM_edgeloop_length_get(el_store_a); + const uint len_b = BM_edgeloop_length_get(el_store_b); + const uint e_arr_a_len = len_a - (BM_edgeloop_is_closed(el_store_a) ? 0 : 1); + const uint e_arr_b_len = len_b - (BM_edgeloop_is_closed(el_store_b) ? 0 : 1); BMEdge **e_arr_a = BLI_array_alloca(e_arr_a, e_arr_a_len); BMEdge **e_arr_b = BLI_array_alloca(e_arr_b, e_arr_b_len); - unsigned int i; + uint i; struct BMEdgeLoopStore *el_store_pair[2] = {el_store_a, el_store_b}; - unsigned int side_index; + uint side_index; float (*nors_pair[2])[3]; GHash *nors_gh_pair[2]; @@ -768,8 +768,8 @@ static void bm_edgering_pair_interpolate( bm_vert_calc_surface_tangent(bm, v_b, no_b); #else { - const unsigned int index_a = GET_UINT_FROM_POINTER(BLI_ghash_lookup(lpair->nors_gh_a, v_a)); - const unsigned int index_b = GET_UINT_FROM_POINTER(BLI_ghash_lookup(lpair->nors_gh_b, v_b)); + const uint index_a = GET_UINT_FROM_POINTER(BLI_ghash_lookup(lpair->nors_gh_a, v_a)); + const uint index_b = GET_UINT_FROM_POINTER(BLI_ghash_lookup(lpair->nors_gh_b, v_b)); BLI_assert(BLI_ghash_haskey(lpair->nors_gh_a, v_a)); BLI_assert(BLI_ghash_haskey(lpair->nors_gh_b, v_b)); diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c index 6bd3174d27a..4e8bace59e0 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.c +++ b/source/blender/bmesh/operators/bmo_triangulate.c @@ -77,7 +77,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op) GHash *sf_vert_map; float normal[3]; const int scanfill_flag = BLI_SCANFILL_CALC_HOLES | BLI_SCANFILL_CALC_POLYS | BLI_SCANFILL_CALC_LOOSE; - unsigned int nors_tot; + uint nors_tot; bool calc_winding = false; sf_vert_map = BLI_ghash_ptr_new_ex(__func__, BMO_slot_buffer_count(op->slots_in, "edges")); @@ -89,7 +89,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op) BMO_ITER (e, &siter, op->slots_in, "edges", BM_EDGE) { ScanFillVert *sf_verts[2]; BMVert **e_verts = &e->v1; - unsigned int i; + uint i; BMO_edge_flag_enable(bm, e, EDGE_MARK); @@ -115,7 +115,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op) * Since we don't know winding, just accumulate */ ScanFillVert *sf_vert; struct SortNormal *nors; - unsigned int i; + uint i; bool is_degenerate = true; nors = MEM_mallocN(sizeof(*nors) * nors_tot, __func__); @@ -124,7 +124,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op) BMVert *v = sf_vert->tmp.p; BMIter eiter; BMEdge *e_pair[2]; - unsigned int e_index = 0; + uint e_index = 0; nors[i].value = -1.0f; @@ -199,7 +199,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op) int winding_votes = 0; for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next) { BMVert *v_tri[3] = {sf_tri->v1->tmp.p, sf_tri->v2->tmp.p, sf_tri->v3->tmp.p}; - unsigned int i, i_prev; + uint i, i_prev; for (i = 0, i_prev = 2; i < 3; i_prev = i++) { e = BM_edge_exists(v_tri[i], v_tri[i_prev]); |