Commit: d66d5b431e359e8938b8bc00090d4a73dbe12168 Author: Joseph Eagar Date: Tue Jun 29 05:50:40 2021 -0700 Branches: temp_bmesh_multires https://developer.blender.org/rBd66d5b431e359e8938b8bc00090d4a73dbe12168
Clean up a few warnings =================================================================== M source/blender/bmesh/intern/bmesh_construct.c M source/blender/bmesh/intern/bmesh_interp.c M source/blender/bmesh/intern/bmesh_log.c M source/blender/bmesh/intern/bmesh_mesh_convert.c =================================================================== diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 9fa73e541b1..ea144e1daea 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -671,7 +671,6 @@ void BM_mesh_copy_init_customdata(BMesh *bm_dst, BMesh *bm_src, const BMAllocTem for (int i = 0; i < 4; i++) { CustomData *cdata = srcdatas[i]; - int type = 1 << i; if (CustomData_has_layer(cdata, CD_MESH_ID)) { int idx = CustomData_get_layer_index(cdata, CD_MESH_ID); @@ -697,7 +696,6 @@ void BM_mesh_copy_init_customdata(BMesh *bm_dst, BMesh *bm_src, const BMAllocTem // flag mesh id layer as temporary for (int i = 0; i < 4; i++) { CustomData *cdata = dstdatas[i]; - int type = 1 << i; if (CustomData_has_layer(cdata, CD_MESH_ID)) { int idx = CustomData_get_layer_index(cdata, CD_MESH_ID); @@ -790,8 +788,6 @@ BMesh *BM_mesh_copy(BMesh *bm_old) bm_init_idmap_cdlayers(bm_new); } - const int idflag = bm_new->idmap.flag; - vtable = MEM_mallocN(sizeof(BMVert *) * bm_old->totvert, "BM_mesh_copy vtable"); etable = MEM_mallocN(sizeof(BMEdge *) * bm_old->totedge, "BM_mesh_copy etable"); ftable = MEM_mallocN(sizeof(BMFace *) * bm_old->totface, "BM_mesh_copy ftable"); diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index e4a81aa5a31..f745f243ed6 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -1402,7 +1402,7 @@ void BM_data_layers_ensure(BMesh *bm, CustomData *data, BMCustomLayerReq *layers BMCustomLayerReq *req = layers + i; int idx; - mask |= 1 << req->type; + mask |= 1LL << req->type; if (req->name) { idx = CustomData_get_named_layer_index(data, req->type, req->name); diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index 8182681f278..eb304a0b14a 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -433,7 +433,7 @@ static void bm_log_verts_unmake( } } -ATTR_NO_OPT static void bm_log_faces_unmake( +static void bm_log_faces_unmake( BMesh *bm, BMLog *log, GHash *faces, BMLogEntry *entry, BMLogCallbacks *callbacks) { GHashIterator gh_iter; @@ -796,7 +796,6 @@ void BM_log_set_bm(BMesh *bm, BMLog *log) BMLog *BM_log_create(BMesh *bm, int cd_dyn_vert) { BMLog *log = MEM_callocN(sizeof(*log), __func__); - const uint reserve_num = (uint)(bm->totvert + bm->totface); BLI_rw_mutex_init(&log->lock); diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.c b/source/blender/bmesh/intern/bmesh_mesh_convert.c index 9ee9791ad43..9f6bdbf2e65 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_convert.c +++ b/source/blender/bmesh/intern/bmesh_mesh_convert.c @@ -804,7 +804,6 @@ void BM_mesh_bm_to_me( // clear mesh id layer flags if (params->copy_mesh_id_layers) { CustomData *srcdatas[] = {&bm->vdata, &bm->edata, &bm->ldata, &bm->pdata}; - CustomData *dstdatas[] = {&me->vdata, &me->edata, &me->ldata, &me->pdata}; for (int i = 0; i < 4; i++) { int idx = CustomData_get_layer_index(srcdatas[i], CD_MESH_ID); @@ -1184,7 +1183,6 @@ void BM_mesh_bm_to_me( if (params->copy_mesh_id_layers) { // restore mesh id layer flags in bm CustomData *srcdatas[] = {&bm->vdata, &bm->edata, &bm->ldata, &bm->pdata}; - CustomData *dstdatas[] = {&me->vdata, &me->edata, &me->ldata, &me->pdata}; for (int i = 0; i < 4; i++) { int idx = CustomData_get_layer_index(srcdatas[i], CD_MESH_ID); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs