[Bf-blender-cvs] [d529e13d650] temp_bmesh_multires: Sculpt dyntopo: fix msvc compiler error

[Joseph Eagar]

Commit: d529e13d650b75f1f8808215e05eb9412c8810ce
Author: Joseph Eagar
Date:   Mon Jul 12 16:01:17 2021 -0400
Branches: temp_bmesh_multires
https://developer.blender.org/rBd529e13d650b75f1f8808215e05eb9412c8810ce

Sculpt dyntopo: fix msvc compiler error

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

M	source/blender/blenlib/BLI_mempool.h
M	source/blender/blenlib/intern/BLI_mempool.c
M	source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c

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

diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h
index 5b86f79cba9..b8e1a22b875 100644
--- a/source/blender/blenlib/BLI_mempool.h
+++ b/source/blender/blenlib/BLI_mempool.h
@@ -98,12 +98,12 @@ in chunks of size pchunk, and returned in r_chunks.
 */
 
 BLI_mempool *BLI_mempool_create_for_tasks(const unsigned int esize,
-                                          unsigned int totelem,
-                                          const unsigned int pchunk,
+                                          int totelem,
+                                          const int pchunk,
                                           void ***r_chunks,
-                                          unsigned int *r_totchunk,
-                                          unsigned int *r_esize,
-                                          unsigned int flag);
+                                          int *r_totchunk,
+                                          int *r_esize,
+                                          int flag);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c
index 9f052e45599..2df4e44b253 100644
--- a/source/blender/blenlib/intern/BLI_mempool.c
+++ b/source/blender/blenlib/intern/BLI_mempool.c
@@ -281,12 +281,12 @@ to tasks.
 */
 
 BLI_mempool *BLI_mempool_create_for_tasks(const unsigned int esize,
-                                          unsigned int totelem,
-                                          const unsigned int pchunk,
+                                          int totelem,
+                                          const int pchunk,
                                           void ***r_chunks,
-                                          unsigned int *r_totchunk,
-                                          unsigned int *r_esize,
-                                          unsigned int flag)
+                                          int *r_totchunk,
+                                          int *r_esize,
+                                          int flag)
 {
   BLI_mempool *pool = BLI_mempool_create(esize, 0, pchunk, flag);
 
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c b/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c
index f44c83046ef..44957591b9f 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c
@@ -341,33 +341,33 @@ BMesh *BM_mesh_bm_from_me_threaded(BMesh *bm,
   int vsize, esize, lsize, fsize;
 
   bm->vpool = BLI_mempool_create_for_tasks(sizeof(BMVert),
-                                           (uint)bm->totvert,
-                                           (uint)VCHUNK,
+                                           bm->totvert,
+                                           VCHUNK,
                                            (void ***)&verts,
-                                           (uint)&totcv,
-                                           (uint)&vsize,
-                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
+                                           &totcv,
+                                           &vsize,
+                                           BLI_MEMPOOL_ALLOW_ITER);
   bm->epool = BLI_mempool_create_for_tasks(sizeof(BMEdge),
-                                           (uint)bm->totedge,
-                                           (uint)ECHUNK,
+                                           bm->totedge,
+                                           ECHUNK,
                                            (void ***)&edges,
-                                           (uint)&totce,
-                                           (uint)&esize,
-                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
+                                           &totce,
+                                           &esize,
+                                           BLI_MEMPOOL_ALLOW_ITER);
   bm->lpool = BLI_mempool_create_for_tasks(sizeof(BMLoop),
-                                           (uint)bm->totloop,
-                                           (uint)LCHUNK,
+                                           bm->totloop,
+                                           LCHUNK,
                                            (void ***)&loops,
-                                           (uint)&totcl,
-                                           (uint)&lsize,
-                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
+                                           &totcl,
+                                           &lsize,
+                                           BLI_MEMPOOL_ALLOW_ITER);
   bm->fpool = BLI_mempool_create_for_tasks(sizeof(BMFace),
-                                           (uint)bm->totface,
-                                           (uint)FCHUNK,
+                                           bm->totface,
+                                           FCHUNK,
                                            (void ***)&faces,
-                                           (uint)&totcf,
-                                           (uint)&fsize,
-                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
+                                           &totcf,
+                                           &fsize,
+                                           BLI_MEMPOOL_ALLOW_ITER);
 
   data.verts = verts;
   data.edges = edges;