[Bf-blender-cvs] [3da0b52c978] master: Cleanup: compiler warnings signed/unsigned mismatch

Campbell Barton noreply at git.blender.org
Mon Jun 7 16:50:53 CEST 2021


Commit: 3da0b52c978aa63d95bd33e5e68dd68ac7d495bd
Author: Campbell Barton
Date:   Tue Jun 8 00:50:05 2021 +1000
Branches: master
https://developer.blender.org/rB3da0b52c978aa63d95bd33e5e68dd68ac7d495bd

Cleanup: compiler warnings signed/unsigned mismatch

===================================================================

M	source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
M	source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc

===================================================================

diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c b/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
index 31ddf625336..1d44f9f911b 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_extractors.c
@@ -331,7 +331,7 @@ static void extract_lines_iter_ledge_bm(const MeshRenderData *mr,
 
 static void extract_lines_iter_ledge_mesh(const MeshRenderData *mr,
                                           const MEdge *med,
-                                          const uint ledge_index,
+                                          const int ledge_index,
                                           void *elb)
 {
   const int l_index_offset = mr->edge_len + ledge_index;
@@ -1193,7 +1193,7 @@ static void extract_pos_nor_iter_ledge_bm(const MeshRenderData *mr,
 
 static void extract_pos_nor_iter_ledge_mesh(const MeshRenderData *mr,
                                             const MEdge *med,
-                                            const uint ledge_index,
+                                            const int ledge_index,
                                             void *_data)
 {
   MeshExtract_PosNor_Data *data = _data;
@@ -1378,7 +1378,7 @@ static void extract_pos_nor_hq_iter_ledge_bm(const MeshRenderData *mr,
 
 static void extract_pos_nor_hq_iter_ledge_mesh(const MeshRenderData *mr,
                                                const MEdge *med,
-                                               const uint ledge_index,
+                                               const int ledge_index,
                                                void *_data)
 {
   MeshExtract_PosNorHQ_Data *data = _data;
@@ -2418,7 +2418,7 @@ static void extract_edge_fac_iter_ledge_bm(const MeshRenderData *mr,
 
 static void extract_edge_fac_iter_ledge_mesh(const MeshRenderData *mr,
                                              const MEdge *UNUSED(med),
-                                             const uint ledge_index,
+                                             const int ledge_index,
                                              void *_data)
 {
   MeshExtract_EdgeFac_Data *data = _data;
@@ -2847,7 +2847,7 @@ static void extract_edit_data_iter_ledge_bm(const MeshRenderData *mr,
 
 static void extract_edit_data_iter_ledge_mesh(const MeshRenderData *mr,
                                               const MEdge *med,
-                                              const uint ledge_index,
+                                              const int ledge_index,
                                               void *_data)
 {
   EditLoopData *data = (EditLoopData *)_data + mr->loop_len + ledge_index * 2;
@@ -4543,7 +4543,7 @@ static void extract_vert_idx_iter_poly_mesh(const MeshRenderData *mr,
 
 static void extract_edge_idx_iter_ledge_mesh(const MeshRenderData *mr,
                                              const MEdge *UNUSED(med),
-                                             const uint ledge_index,
+                                             const int ledge_index,
                                              void *data)
 {
   const int e_index = mr->ledges[ledge_index];
@@ -4554,7 +4554,7 @@ static void extract_edge_idx_iter_ledge_mesh(const MeshRenderData *mr,
 
 static void extract_vert_idx_iter_ledge_mesh(const MeshRenderData *mr,
                                              const MEdge *med,
-                                             const uint ledge_index,
+                                             const int ledge_index,
                                              void *data)
 {
   int v1_orig = (mr->v_origindex) ? mr->v_origindex[med->v1] : med->v1;
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
index 66174e686ea..d749a3ab8d1 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
@@ -109,7 +109,7 @@ static void extract_points_iter_ledge_bm(const MeshRenderData *mr,
 
 static void extract_points_iter_ledge_mesh(const MeshRenderData *mr,
                                            const MEdge *med,
-                                           const uint ledge_index,
+                                           const int ledge_index,
                                            void *_userdata)
 {
   GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(_userdata);



More information about the Bf-blender-cvs mailing list