[Bf-blender-cvs] [1b9a835893d] temp_bmesh_multires: Make gcc happy

[Joseph Eagar]

Commit: 1b9a835893dc3a6b0e7c8623362c1b60365c4629
Author: Joseph Eagar
Date:   Sun Jul 11 23:57:14 2021 -0400
Branches: temp_bmesh_multires
https://developer.blender.org/rB1b9a835893dc3a6b0e7c8623362c1b60365c4629

Make gcc happy

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

M	source/blender/bmesh/intern/bmesh_inline.h
M	source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c

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

diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h
index 5b4fb35946b..260ef98ddad 100644
--- a/source/blender/bmesh/intern/bmesh_inline.h
+++ b/source/blender/bmesh/intern/bmesh_inline.h
@@ -80,8 +80,8 @@ BLI_INLINE void _bm_elem_flag_merge(BMHeader *head_a, BMHeader *head_b)
 BLI_INLINE void _bm_elem_flag_merge_ex(BMHeader *head_a, BMHeader *head_b, const char hflag_and)
 {
   if (((head_a->hflag & head_b->hflag) & hflag_and) == (char)0) {
-    head_a->hflag &= ~hflag_and;
-    head_b->hflag &= ~hflag_and;
+    head_a->hflag &= (char)(~hflag_and);
+    head_b->hflag &= (char)(~hflag_and);
   }
   _bm_elem_flag_merge(head_a, head_b);
 }
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c b/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.c
index 44957591b9f..f44c83046ef 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),
-                                           bm->totvert,
-                                           VCHUNK,
+                                           (uint)bm->totvert,
+                                           (uint)VCHUNK,
                                            (void ***)&verts,
-                                           &totcv,
-                                           &vsize,
-                                           BLI_MEMPOOL_ALLOW_ITER);
+                                           (uint)&totcv,
+                                           (uint)&vsize,
+                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
   bm->epool = BLI_mempool_create_for_tasks(sizeof(BMEdge),
-                                           bm->totedge,
-                                           ECHUNK,
+                                           (uint)bm->totedge,
+                                           (uint)ECHUNK,
                                            (void ***)&edges,
-                                           &totce,
-                                           &esize,
-                                           BLI_MEMPOOL_ALLOW_ITER);
+                                           (uint)&totce,
+                                           (uint)&esize,
+                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
   bm->lpool = BLI_mempool_create_for_tasks(sizeof(BMLoop),
-                                           bm->totloop,
-                                           LCHUNK,
+                                           (uint)bm->totloop,
+                                           (uint)LCHUNK,
                                            (void ***)&loops,
-                                           &totcl,
-                                           &lsize,
-                                           BLI_MEMPOOL_ALLOW_ITER);
+                                           (uint)&totcl,
+                                           (uint)&lsize,
+                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
   bm->fpool = BLI_mempool_create_for_tasks(sizeof(BMFace),
-                                           bm->totface,
-                                           FCHUNK,
+                                           (uint)bm->totface,
+                                           (uint)FCHUNK,
                                            (void ***)&faces,
-                                           &totcf,
-                                           &fsize,
-                                           BLI_MEMPOOL_ALLOW_ITER);
+                                           (uint)&totcf,
+                                           (uint)&fsize,
+                                           (uint)BLI_MEMPOOL_ALLOW_ITER);
 
   data.verts = verts;
   data.edges = edges;