diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-23 02:02:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-23 02:02:46 +0400 |
| commit | 5d26f5dabc69be88eec64bb0b6ed323302b1aa04 (patch) | |
| tree | f0d0d94843e3ba2c1c1bb7d362a9cf131d409c62 /source/blender | |
| parent | 08f466cce896d0025aa14f496a280c80eb2f06f2 (diff) | |
fix for build errors
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/bmesh/operators/edgesplitop.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/bmesh/operators/edgesplitop.c b/source/blender/bmesh/operators/edgesplitop.c index 13f44c38102..124d1f31b7b 100644 --- a/source/blender/bmesh/operators/edgesplitop.c +++ b/source/blender/bmesh/operators/edgesplitop.c @@ -102,8 +102,8 @@ static BMFace *remake_face(BMesh *bm, EdgeTag *etags, BMFace *f, BMVert **verts, if (l->e != l2->e) { /*set up data for figuring out the two sides of the splits*/ - BMO_SetIndex(bm, l2->e, BMO_GetIndex(bm, l->e)); - et = etags + BMO_GetIndex(bm, l->e); + BMO_SetIndex(bm, &l2->e->head, BMO_GetIndex(bm, &l->e->head)); + et = etags + BMO_GetIndex(bm, &l->e->head); if (!et->newe1) { et->newe1 = l2->e; @@ -147,7 +147,7 @@ static void tag_out_edges(BMesh *bm, EdgeTag *etags, BMOperator *UNUSED(op)) if (!BMO_TestFlag(bm, e, EDGE_SEAM)) continue; - et = etags + BMO_GetIndex(bm, e); + et = etags + BMO_GetIndex(bm, &e->head); if (!et->tag && e->l) { break; } @@ -164,7 +164,7 @@ static void tag_out_edges(BMesh *bm, EdgeTag *etags, BMOperator *UNUSED(op)) v = i ? l->next->v : l->v; while (1) { - et = etags + BMO_GetIndex(bm, l->e); + et = etags + BMO_GetIndex(bm, &l->e->head); if (et->newe1 == l->e) { if (et->newe1) { BMO_SetFlag(bm, et->newe1, EDGE_RET1); @@ -248,7 +248,7 @@ void bmesh_edgesplitop_exec(BMesh *bm, BMOperator *op) etags = MEM_callocN(sizeof(EdgeTag)*bm->totedge, "EdgeTag"); BM_ITER_INDEX(e, &iter, bm, BM_EDGES_OF_MESH, NULL, i) { - BMO_SetIndex(bm, e, i); + BMO_SetIndex(bm, &e->head, i); } #ifdef ETV @@ -281,7 +281,7 @@ void bmesh_edgesplitop_exec(BMesh *bm, BMOperator *op) if (!BMO_TestFlag(bm, l->e, EDGE_SEAM)) { if (!verts[i]) { - et = etags + BMO_GetIndex(bm, l->e); + et = etags + BMO_GetIndex(bm, &l->e->head); if (ETV(et, l->v, l)) { verts[i] = ETV(et, l->v, l); } @@ -336,7 +336,7 @@ void bmesh_edgesplitop_exec(BMesh *bm, BMOperator *op) } while (l3 != l2 && !BMO_TestFlag(bm, l3->e, EDGE_SEAM)); if (l3 == NULL || (BMO_TestFlag(bm, l3->e, EDGE_SEAM) && l3->e != l->e)) { - et = etags + BMO_GetIndex(bm, l2->e); + et = etags + BMO_GetIndex(bm, &l2->e->head); if (ETV(et, v, l2) == NULL) { v2 = BM_Make_Vert(bm, v->co, v); @@ -350,7 +350,7 @@ void bmesh_edgesplitop_exec(BMesh *bm, BMOperator *op) l3 = l3->radial_next; l3 = BM_OtherFaceLoop(l3->e, l3->f, v); - et = etags + BMO_GetIndex(bm, l3->e); + et = etags + BMO_GetIndex(bm, &l3->e->head); } while (l3 != l2 && !BMO_TestFlag(bm, l3->e, EDGE_SEAM)); } else { |