Cleanup: replace uint cd_loop_uv_offset with int

See https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Integer_Types

4 files changed, 35 insertions, 31 deletions

diff --git a/source/blender/editors/uvedit/uvedit_islands.c b/source/blender/editors/uvedit/uvedit_islands.c
index 3877a9bb63b..68c00b18b09 100644
--- a/source/blender/editors/uvedit/uvedit_islands.c
+++ b/source/blender/editors/uvedit/uvedit_islands.c
@@ -76,9 +76,10 @@ static void bm_face_uv_translate_and_scale_around_pivot(BMFace *f,
 
 static void bm_face_array_calc_bounds(BMFace **faces,
                                       int faces_len,
-                                      const uint cd_loop_uv_offset,
+                                      const int cd_loop_uv_offset,
                                       rctf *r_bounds_rect)
 {
+  BLI_assert(cd_loop_uv_offset >= 0);
   float bounds_min[2], bounds_max[2];
   INIT_MINMAX2(bounds_min, bounds_max);
   for (int i = 0; i < faces_len; i++) {
@@ -96,8 +97,9 @@ static void bm_face_array_calc_bounds(BMFace **faces,
  * without duplicating coordinates for loops that share a vertex.
  */
 static float (*bm_face_array_calc_unique_uv_coords(
-    BMFace **faces, int faces_len, const uint cd_loop_uv_offset, int *r_coords_len))[2]
+    BMFace **faces, int faces_len, const int cd_loop_uv_offset, int *r_coords_len))[2]
 {
+  BLI_assert(cd_loop_uv_offset >= 0);
   int coords_len_alloc = 0;
   for (int i = 0; i < faces_len; i++) {
     BMFace *f = faces[i];
@@ -164,7 +166,7 @@ static float (*bm_face_array_calc_unique_uv_coords(
 static void bm_face_array_uv_rotate_fit_aabb(BMFace **faces,
                                              int faces_len,
                                              int align_to_axis,
-                                             const uint cd_loop_uv_offset)
+                                             const int cd_loop_uv_offset)
 {
   /* Calculate unique coordinates since calculating a convex hull can be an expensive operation. */
   int coords_len;
@@ -209,7 +211,7 @@ static void bm_face_array_uv_rotate_fit_aabb(BMFace **faces,
 static void bm_face_array_uv_scale_y(BMFace **faces,
                                      int faces_len,
                                      const float scale_y,
-                                     const uint cd_loop_uv_offset)
+                                     const int cd_loop_uv_offset)
 {
   for (int i = 0; i < faces_len; i++) {
     BMFace *f = faces[i];
@@ -311,7 +313,7 @@ static float uv_nearest_grid_tile_distance(const int udim_grid[2],
  * \{ */
 
 struct SharedUVLoopData {
-  uint cd_loop_uv_offset;
+  int cd_loop_uv_offset;
   bool use_seams;
 };
 
@@ -338,8 +340,9 @@ int bm_mesh_calc_uv_islands(const Scene *scene,
                             const bool only_selected_uvs,
                             const bool use_seams,
                             const float aspect_y,
-                            const uint cd_loop_uv_offset)
+                            const int cd_loop_uv_offset)
 {
+  BLI_assert(cd_loop_uv_offset >= 0);
   int island_added = 0;
   BM_mesh_elem_table_ensure(bm, BM_FACE);
 
diff --git a/source/blender/editors/uvedit/uvedit_path.c b/source/blender/editors/uvedit/uvedit_path.c
index 4e8d9a2214c..19218259b95 100644
--- a/source/blender/editors/uvedit/uvedit_path.c
+++ b/source/blender/editors/uvedit/uvedit_path.c
@@ -71,7 +71,7 @@ struct PathSelectParams {
 struct UserData_UV {
   Scene *scene;
   BMEditMesh *em;
-  uint cd_loop_uv_offset;
+  int cd_loop_uv_offset;
 };
 
 static void path_select_properties(wmOperatorType *ot)
@@ -121,7 +121,7 @@ static bool verttag_test_cb(BMLoop *l, void *user_data_v)
   /* All connected loops are selected or we return false. */
   struct UserData_UV *user_data = user_data_v;
   const Scene *scene = user_data->scene;
-  const uint cd_loop_uv_offset = user_data->cd_loop_uv_offset;
+  const int cd_loop_uv_offset = user_data->cd_loop_uv_offset;
   const MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
   BMIter iter;
   BMLoop *l_iter;
@@ -142,7 +142,7 @@ static void verttag_set_cb(BMLoop *l, bool val, void *user_data_v)
   struct UserData_UV *user_data = user_data_v;
   const Scene *scene = user_data->scene;
   BMEditMesh *em = user_data->em;
-  const uint cd_loop_uv_offset = user_data->cd_loop_uv_offset;
+  const int cd_loop_uv_offset = user_data->cd_loop_uv_offset;
   const MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
   BMIter iter;
   BMLoop *l_iter;
@@ -253,7 +253,7 @@ static bool edgetag_test_cb(BMLoop *l, void *user_data_v)
   /* All connected loops (UV) are selected or we return false. */
   struct UserData_UV *user_data = user_data_v;
   const Scene *scene = user_data->scene;
-  const uint cd_loop_uv_offset = user_data->cd_loop_uv_offset;
+  const int cd_loop_uv_offset = user_data->cd_loop_uv_offset;
   BMIter iter;
   BMLoop *l_iter;
   BM_ITER_ELEM (l_iter, &iter, l->e, BM_LOOPS_OF_EDGE) {
@@ -272,7 +272,7 @@ static void edgetag_set_cb(BMLoop *l, bool val, void *user_data_v)
   struct UserData_UV *user_data = user_data_v;
   const Scene *scene = user_data->scene;
   BMEditMesh *em = user_data->em;
-  const uint cd_loop_uv_offset = user_data->cd_loop_uv_offset;
+  const int cd_loop_uv_offset = user_data->cd_loop_uv_offset;
   uvedit_edge_select_set_with_sticky(scene, em, l, val, false, cd_loop_uv_offset);
 }
 
@@ -375,7 +375,7 @@ static bool facetag_test_cb(BMFace *f, void *user_data_v)
   /* All connected loops are selected or we return false. */
   struct UserData_UV *user_data = user_data_v;
   const Scene *scene = user_data->scene;
-  const uint cd_loop_uv_offset = user_data->cd_loop_uv_offset;
+  const int cd_loop_uv_offset = user_data->cd_loop_uv_offset;
   BMIter iter;
   BMLoop *l_iter;
   BM_ITER_ELEM (l_iter, &iter, f, BM_LOOPS_OF_FACE) {
@@ -390,7 +390,7 @@ static void facetag_set_cb(BMFace *f, bool val, void *user_data_v)
   struct UserData_UV *user_data = user_data_v;
   const Scene *scene = user_data->scene;
   BMEditMesh *em = user_data->em;
-  const uint cd_loop_uv_offset = user_data->cd_loop_uv_offset;
+  const int cd_loop_uv_offset = user_data->cd_loop_uv_offset;
   uvedit_face_select_set_with_sticky(scene, em, f, val, false, cd_loop_uv_offset);
 }
 
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index 653399372e2..8fc97dbe0ce 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -317,7 +317,7 @@ void uvedit_face_select_set(const Scene *scene,
                             BMFace *efa,
                             const bool select,
                             const bool do_history,
-                            const uint cd_loop_uv_offset)
+                            const int cd_loop_uv_offset)
 {
   if (select) {
     uvedit_face_select_enable(scene, bm, efa, do_history, cd_loop_uv_offset);
@@ -327,12 +327,10 @@ void uvedit_face_select_set(const Scene *scene,
   }
 }
 
-void uvedit_face_select_enable(const Scene *scene,
-                               BMesh *bm,
-                               BMFace *efa,
-                               const bool do_history,
-                               const uint cd_loop_uv_offset)
+void uvedit_face_select_enable(
+    const Scene *scene, BMesh *bm, BMFace *efa, const bool do_history, const int cd_loop_uv_offset)
 {
+  BLI_assert(cd_loop_uv_offset >= 0);
   const ToolSettings *ts = scene->toolsettings;
 
   if (ts->uv_flag & UV_SYNC_SELECTION) {
@@ -356,8 +354,9 @@ void uvedit_face_select_enable(const Scene *scene,
 void uvedit_face_select_disable(const Scene *scene,
                                 BMesh *bm,
                                 BMFace *efa,
-                                const uint cd_loop_uv_offset)
+                                const int cd_loop_uv_offset)
 {
+  BLI_assert(cd_loop_uv_offset >= 0);
   const ToolSettings *ts = scene->toolsettings;
 
   if (ts->uv_flag & UV_SYNC_SELECTION) {
@@ -407,7 +406,7 @@ void uvedit_edge_select_set_with_sticky(const Scene *scene,
                                         BMLoop *l,
                                         const bool select,
                                         const bool do_history,
-                                        const uint cd_loop_uv_offset)
+                                        const int cd_loop_uv_offset)
 {
   const ToolSettings *ts = scene->toolsettings;
   if (ts->uv_flag & UV_SYNC_SELECTION) {
@@ -505,7 +504,7 @@ void uvedit_edge_select_set(const Scene *scene,
                             BMLoop *l,
                             const bool select,
                             const bool do_history,
-                            const uint cd_loop_uv_offset)
+                            const int cd_loop_uv_offset)
 
 {
   if (select) {
@@ -517,7 +516,7 @@ void uvedit_edge_select_set(const Scene *scene,
 }
 
 void uvedit_edge_select_enable(
-    const Scene *scene, BMesh *bm, BMLoop *l, const bool do_history, const uint cd_loop_uv_offset)
+    const Scene *scene, BMesh *bm, BMLoop *l, const bool do_history, const int cd_loop_uv_offset)
 
 {
   const ToolSettings *ts = scene->toolsettings;
@@ -551,7 +550,7 @@ void uvedit_edge_select_enable(
 void uvedit_edge_select_disable(const Scene *scene,
                                 BMesh *bm,
                                 BMLoop *l,
-                                const uint cd_loop_uv_offset)
+                                const int cd_loop_uv_offset)
 
 {
   const ToolSettings *ts = scene->toolsettings;
@@ -626,7 +625,7 @@ void uvedit_uv_select_set_with_sticky(const Scene *scene,
                                       BMLoop *l,
                                       const bool select,
                                       const bool do_history,
-                                      const uint cd_loop_uv_offset)
+                                      const int cd_loop_uv_offset)
 {
   const ToolSettings *ts = scene->toolsettings;
   if (ts->uv_flag & UV_SYNC_SELECTION) {
@@ -706,7 +705,7 @@ void uvedit_uv_select_set(const Scene *scene,
                           BMLoop *l,
                           const bool select,
                           const bool do_history,
-                          const uint cd_loop_uv_offset)
+                          const int cd_loop_uv_offset)
 {
   if (select) {
     uvedit_uv_select_enable(scene, bm, l, do_history, cd_loop_uv_offset);
@@ -717,7 +716,7 @@ void uvedit_uv_select_set(const Scene *scene,
 }
 
 void uvedit_uv_select_enable(
-    const Scene *scene, BMesh *bm, BMLoop *l, const bool do_history, const uint cd_loop_uv_offset)
+    const Scene *scene, BMesh *bm, BMLoop *l, const bool do_history, const int cd_loop_uv_offset)
 {
   const ToolSettings *ts = scene->toolsettings;
 
@@ -746,7 +745,7 @@ void uvedit_uv_select_enable(
 void uvedit_uv_select_disable(const Scene *scene,
                               BMesh *bm,
                               BMLoop *l,
-                              const uint cd_loop_uv_offset)
+                              const int cd_loop_uv_offset)
 {
   const ToolSettings *ts = scene->toolsettings;
 
@@ -1135,7 +1134,7 @@ BMLoop *uv_find_nearest_loop_from_vert(struct Scene *scene,
                                        const float co[2])
 {
   BMEditMesh *em = BKE_editmesh_from_object(obedit);
-  const uint cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+  const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
 
   BMIter liter;
   BMLoop *l;
@@ -1163,7 +1162,8 @@ BMLoop *uv_find_nearest_loop_from_edge(struct Scene *scene,
                                        const float co[2])
 {
   BMEditMesh *em = BKE_editmesh_from_object(obedit);
-  const uint cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+  const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+  BLI_assert(cd_loop_uv_offset >= 0);
 
   BMIter eiter;
   BMLoop *l;
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index fb71623f4eb..b01a24af68f 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -2290,7 +2290,8 @@ static int smart_project_exec(bContext *C, wmOperator *op)
       continue;
     }
 
-    const uint cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+    const int cd_loop_uv_offset = CustomData_get_offset(&em->bm->ldata, CD_MLOOPUV);
+    BLI_assert(cd_loop_uv_offset >= 0);
     ThickFace *thick_faces = MEM_mallocN(sizeof(*thick_faces) * em->bm->totface, __func__);
 
     uint thick_faces_len = 0;