Commit: d4badd4b22c5f8348e4870c521dc2be04d8d046d Author: Joseph Eagar Date: Thu Sep 2 11:26:28 2021 -0700 Branches: temp_bmesh_multires https://developer.blender.org/rBd4badd4b22c5f8348e4870c521dc2be04d8d046d
Fix compile error =================================================================== M source/blender/bmesh/intern/bmesh_log.c M source/blender/bmesh/intern/bmesh_mesh.c =================================================================== diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index 58f2421596a..1b936d2607b 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -535,8 +535,8 @@ static BMLogFace *bm_log_face_alloc(BMLog *log, BMFace *f) bool have_loop_ids = (log->bm->idmap.flag & BM_LOOP); if (f->len > MAX_FACE_RESERVED) { - lf->v_ids = (int *)BLI_memarena_alloc(entry->arena, sizeof(*lf->v_ids) * lf->len); - lf->l_ids = (int *)BLI_memarena_alloc(entry->arena, sizeof(*lf->l_ids) * lf->len); + lf->v_ids = (uint *)BLI_memarena_alloc(entry->arena, sizeof(*lf->v_ids) * lf->len); + lf->l_ids = (uint *)BLI_memarena_alloc(entry->arena, sizeof(*lf->l_ids) * lf->len); lf->customdata = (void **)BLI_memarena_alloc(entry->arena, sizeof(void *) * lf->len); } else { diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 8220f741fda..08540abbb10 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -1785,7 +1785,6 @@ void BM_swap_verts(BMesh *bm, BMVert *v1, BMVert *v2) for (int i = 0; i < 2; i++) { BMVert *v = i ? v2 : v1; - BMVert *v_2 = i ? v1 : v2; BMEdge *e = v->e, *starte = e; @@ -1826,7 +1825,6 @@ void BM_swap_verts(BMesh *bm, BMVert *v1, BMVert *v2) BMVert *v_2 = i ? v1 : v2; BMEdge **es = i ? es2 : es1; - BMLoop **ls = i ? ls2 : ls1; int elen = i ? BLI_array_len(es2) : BLI_array_len(es1); int *sides = i ? sides2 : sides1; @@ -1871,7 +1869,6 @@ void BM_swap_verts(BMesh *bm, BMVert *v1, BMVert *v2) } for (int i = 0; i < 2; i++) { - BMVert *v = i ? v2 : v1; BMVert *v_2 = i ? v1 : v2; BMLoop **ls = i ? ls2 : ls1; @@ -1933,7 +1930,6 @@ void BM_swap_loops(BMesh *bm, BMLoop *l1, BMLoop *l2) { for (int i = 0; i < 2; i++) { BMLoop *l = i ? l2 : l1; - BMLoop *l_2 = i ? l1 : l2; l->prev->next = l2; l->next->prev = l2; @@ -1974,9 +1970,9 @@ bool BM_defragment_vertex(BMesh *bm, { BMEdge *e = v->e; +#if 0 int cd_vcol = CustomData_get_offset(&bm->vdata, CD_PROP_COLOR); -#if 0 if (cd_vcol >= 0) { float *color = BM_ELEM_CD_GET_VOID_P(v, cd_vcol); int idx = BLI_mempool_find_real_index(bm->vpool, (void *)v); @@ -2004,7 +2000,7 @@ bool BM_defragment_vertex(BMesh *bm, int vlimit = sizeof(BMVert *) * limit; int elimit = sizeof(BMEdge *) * limit; int llimit = sizeof(BMLoop *) * limit; - int flimit = sizeof(BMFace *) * limit; + // int flimit = sizeof(BMFace *) * limit; intptr_t iv = (intptr_t)v; @@ -2096,10 +2092,10 @@ bool BM_defragment_vertex(BMesh *bm, on_vert_swap(v2, elems[i], userdata); BM_swap_verts(bm, v2, elems[i]); +#if 0 BMIter iter; BMEdge *et; int f = 0; -#if 0 BM_ITER_ELEM (et, &iter, v2, BM_EDGES_OF_VERT) { printf("an edge %d\n", f++); } _______________________________________________ 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