diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-06-18 07:27:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-18 07:27:41 +0300 |
commit | 50a4b9d502104aabdd33ed924a89fe018cfa80b3 (patch) | |
tree | 2dc49da2a161034fbe1edd04ead44dbc924fbed7 /source/blender/blenkernel/intern/mesh_merge.c | |
parent | 5f0d4fef91148f3dfb9f962d77c809a293a76ad3 (diff) |
Cleanup: replace 'unsigned in' with 'uint'
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_merge.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index e3b5e5ea434..fb73152cb8e 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -179,13 +179,13 @@ static int cddm_poly_compare(MLoop *mloop_array, /* Utility stuff for using GHash with polys, used by vertex merging. */ typedef struct PolyKey { - int poly_index; /* index of the MPoly within the derived mesh */ - int totloops; /* number of loops in the poly */ - unsigned int hash_sum; /* Sum of all vertices indices */ - unsigned int hash_xor; /* Xor of all vertices indices */ + int poly_index; /* index of the MPoly within the derived mesh */ + int totloops; /* number of loops in the poly */ + uint hash_sum; /* Sum of all vertices indices */ + uint hash_xor; /* Xor of all vertices indices */ } PolyKey; -static unsigned int poly_gset_hash_fn(const void *key) +static uint poly_gset_hash_fn(const void *key) { const PolyKey *pk = key; return pk->hash_sum; @@ -331,8 +331,8 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, med = mesh->medge; c = 0; for (i = 0; i < totedge; i++, med++) { - const unsigned int v1 = (vtargetmap[med->v1] != -1) ? vtargetmap[med->v1] : med->v1; - const unsigned int v2 = (vtargetmap[med->v2] != -1) ? vtargetmap[med->v2] : med->v2; + const uint v1 = (vtargetmap[med->v1] != -1) ? vtargetmap[med->v1] : med->v1; + const uint v2 = (vtargetmap[med->v2] != -1) ? vtargetmap[med->v2] : med->v2; if (LIKELY(v1 != v2)) { void **val_p; |