blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Clean up a few warnings

This commit is contained in:
Joseph Eagar 2021-06-29 05:50:40 -07:00
parent 43a0fe378f
commit d66d5b431e
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/bmesh/intern/bmesh_construct.c
View File

@ -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");

2
source/blender/bmesh/intern/bmesh_interp.c
View File

@ -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);

3
source/blender/bmesh/intern/bmesh_log.c
View File

@ -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);

2
source/blender/bmesh/intern/bmesh_mesh_convert.c
View File

@ -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);