diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 14:51:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 14:51:45 +0400 |
| commit | b6dcdb065d9ca6244f2de9e621439f75cf2c386e (patch) | |
| tree | db7e8287d27bd6e68085dab6cacb997f5eb473a9 /source/blender/editors | |
| parent | 8b43813b69b36af55635028e18e9b179df217317 (diff) | |
code refactor, function renaming for bmesh.
These changes are to make the bmesh api more consistent and easier to learn, grouping similar functions which is convenient for autocomplete.
This uses similar convention to RNA.
* use face/loop/edge/vert as a prefix for functions.
* use 'elem' as a prefix too for functions that can take any type with a BMHeader.
* changed from camel case to underscore separated (like RNA).
Diffstat (limited to 'source/blender/editors')
31 files changed, 958 insertions, 958 deletions
diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index 948eb55b55f..8e09055a93b 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -71,11 +71,11 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend) BMIter iter; BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(v1, BM_ELEM_SELECT) || BM_TestHFlag(v1, BM_ELEM_HIDDEN)) { - BM_ClearHFlag(v1, BM_ELEM_TAG); + if (!BM_elem_flag_test(v1, BM_ELEM_SELECT) || BM_elem_flag_test(v1, BM_ELEM_HIDDEN)) { + BM_elem_flag_clear(v1, BM_ELEM_TAG); } else { - BM_SetHFlag(v1, BM_ELEM_TAG); + BM_elem_flag_set(v1, BM_ELEM_TAG); } } @@ -85,12 +85,12 @@ void EDBM_select_mirrored(Object *UNUSED(obedit), BMEditMesh *em, int extend) EDBM_clear_flag_all(em, BM_ELEM_SELECT); BM_ITER(v1, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(v1, BM_ELEM_TAG) || BM_TestHFlag(v1, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(v1, BM_ELEM_TAG) || BM_elem_flag_test(v1, BM_ELEM_HIDDEN)) continue; v2 = EDBM_GetMirrorVert(em, v1); - if (v2 && !BM_TestHFlag(v2, BM_ELEM_HIDDEN)) { - BM_Select(em->bm, v2, TRUE); + if (v2 && !BM_elem_flag_test(v2, BM_ELEM_HIDDEN)) { + BM_elem_select_set(em->bm, v2, TRUE); } } @@ -108,7 +108,7 @@ void EDBM_automerge(Scene *scene, Object *obedit, int update) if (!em) return; - BMO_CallOpf(em->bm, "automerge verts=%hv dist=%f", BM_ELEM_SELECT, scene->toolsettings->doublimit); + BMO_op_callf(em->bm, "automerge verts=%hv dist=%f", BM_ELEM_SELECT, scene->toolsettings->doublimit); if (update) { DAG_id_tag_update(obedit->data, OB_RECALC_DATA); } @@ -334,7 +334,7 @@ static void findnearestvert__doClosest(void *userData, BMVert *eve, int x, int y if (data->dist > 3) { int temp = abs(data->mval[0] - x) + abs(data->mval[1]- y); - if (BM_TestHFlag(eve, BM_ELEM_SELECT) == data->select) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT) == data->select) { if (data->strict == 1) return; else @@ -355,9 +355,9 @@ static void findnearestvert__doClosest(void *userData, BMVert *eve, int x, int y static unsigned int findnearestvert__backbufIndextest(void *handle, unsigned int index) { BMEditMesh *em = (BMEditMesh *)handle; - BMVert *eve = BM_Vert_AtIndex(em->bm, index - 1); + BMVert *eve = BM_vert_at_index(em->bm, index - 1); - if (eve && BM_TestHFlag(eve, BM_ELEM_SELECT)) return 0; + if (eve && BM_elem_flag_test(eve, BM_ELEM_SELECT)) return 0; return 1; } /** @@ -385,7 +385,7 @@ BMVert *EDBM_findnearestvert(ViewContext *vc, int *dist, short sel, short strict 0, NULL, NULL); } - eve = BM_Vert_AtIndex(vc->em->bm, index - 1); + eve = BM_vert_at_index(vc->em->bm, index - 1); if (eve && distance < *dist) { *dist = distance; @@ -401,7 +401,7 @@ BMVert *EDBM_findnearestvert(ViewContext *vc, int *dist, short sel, short strict static int lastSelectedIndex = 0; static BMVert *lastSelected = NULL; - if (lastSelected && BM_Vert_AtIndex(vc->em->bm, lastSelectedIndex) != lastSelected) { + if (lastSelected && BM_vert_at_index(vc->em->bm, lastSelectedIndex) != lastSelected) { lastSelectedIndex = 0; lastSelected = NULL; } @@ -462,7 +462,7 @@ static void findnearestedge__doClosest(void *userData, BMEdge *eed, int x0, int distance = dist_to_line_segment_v2(data->mval, v1, v2); - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { distance += 5; } @@ -498,7 +498,7 @@ BMEdge *EDBM_findnearestedge(ViewContext *vc, int *dist) view3d_validate_backbuf(vc); index = view3d_sample_backbuf_rect(vc, vc->mval, 50, bm_solidoffs, bm_wireoffs, &distance,0, NULL, NULL); - eed = BM_Edge_AtIndex(vc->em->bm, index - 1); + eed = BM_edge_at_index(vc->em->bm, index - 1); if (eed && distance < *dist) { *dist = distance; @@ -570,7 +570,7 @@ BMFace *EDBM_findnearestface(ViewContext *vc, int *dist) view3d_validate_backbuf(vc); index = view3d_sample_backbuf(vc, vc->mval[0], vc->mval[1]); - efa = BM_Face_AtIndex(vc->em->bm, index - 1); + efa = BM_face_at_index(vc->em->bm, index - 1); if (efa) { struct { short mval[2]; int dist; BMFace *toFace; } data; @@ -595,7 +595,7 @@ BMFace *EDBM_findnearestface(ViewContext *vc, int *dist) static int lastSelectedIndex = 0; static BMFace *lastSelected = NULL; - if (lastSelected && BM_Face_AtIndex(vc->em->bm, lastSelectedIndex) != lastSelected) { + if (lastSelected && BM_face_at_index(vc->em->bm, lastSelectedIndex) != lastSelected) { lastSelectedIndex = 0; lastSelected = NULL; } @@ -704,13 +704,13 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "similarfaces faces=%hf type=%d thresh=%f", BM_ELEM_SELECT, type, thresh); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* clear the existing selection */ EDBM_clear_flag_all(em, BM_ELEM_SELECT); /* select the output */ - BMO_HeaderFlag_Buffer(em->bm, &bmop, "faceout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(em->bm, &bmop, "faceout", BM_ELEM_SELECT, BM_ALL); /* finish the operator */ if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { @@ -745,13 +745,13 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "similaredges edges=%he type=%d thresh=%f", BM_ELEM_SELECT, type, thresh); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* clear the existing selection */ EDBM_clear_flag_all(em, BM_ELEM_SELECT); /* select the output */ - BMO_HeaderFlag_Buffer(em->bm, &bmop, "edgeout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(em->bm, &bmop, "edgeout", BM_ELEM_SELECT, BM_ALL); EDBM_selectmode_flush(em); /* finish the operator */ @@ -790,13 +790,13 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "similarverts verts=%hv type=%d thresh=%f", BM_ELEM_SELECT, type, thresh); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* clear the existing selection */ EDBM_clear_flag_all(em, BM_ELEM_SELECT); /* select the output */ - BMO_HeaderFlag_Buffer(em->bm, &bmop, "vertout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(em->bm, &bmop, "vertout", BM_ELEM_SELECT, BM_ALL); /* finish the operator */ if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { @@ -892,17 +892,17 @@ static void walker_select(BMEditMesh *em, int walkercode, void *start, int selec BMHeader *h; BMWalker walker; - BMW_Init(&walker, bm, walkercode, + BMW_init(&walker, bm, walkercode, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); - h = BMW_Begin(&walker, start); - for ( ; h; h = BMW_Step(&walker)) { + h = BMW_begin(&walker, start); + for ( ; h; h = BMW_step(&walker)) { if (!select) { - BM_remove_selection(bm, h); + BM_select_history_remove(bm, h); } - BM_Select(bm, h, select); + BM_elem_select_set(bm, h, select); } - BMW_End(&walker); + BMW_end(&walker); } static int loop_multiselect(bContext *C, wmOperator *op) @@ -917,10 +917,10 @@ static int loop_multiselect(bContext *C, wmOperator *op) BMIter iter; int totedgesel = 0; - for (eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - eed; eed = BMIter_Step(&iter)) { + for (eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + eed; eed = BM_iter_step(&iter)) { - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { totedgesel++; } } @@ -929,12 +929,12 @@ static int loop_multiselect(bContext *C, wmOperator *op) edarray = MEM_mallocN(sizeof(BMEdge *)*totedgesel,"edge array"); edindex = 0; - for (eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + for (eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); eed; - eed = BMIter_Step(&iter)) + eed = BM_iter_step(&iter)) { - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { edarray[edindex] = eed; edindex++; } @@ -1008,7 +1008,7 @@ static void mouse_mesh_loop(bContext *C, int mval[2], short extend, short ring) EDBM_clear_flag_all(em, BM_ELEM_SELECT); } - if (BM_TestHFlag(eed, BM_ELEM_SELECT) == 0) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT) == 0) { select = TRUE; } else if (extend) { @@ -1159,15 +1159,15 @@ static void edgetag_context_set(BMEditMesh *em, Scene *scene, BMEdge *e, int val switch (scene->toolsettings->edge_mode) { case EDGE_MODE_SELECT: - BM_Select(em->bm, e, val); + BM_elem_select_set(em->bm, e, val); break; case EDGE_MODE_TAG_SEAM: - if (val) {BM_SetHFlag(e, BM_ELEM_SEAM);} - else {BM_ClearHFlag(e, BM_ELEM_SEAM);} + if (val) {BM_elem_flag_set(e, BM_ELEM_SEAM);} + else {BM_elem_flag_clear(e, BM_ELEM_SEAM);} break; case EDGE_MODE_TAG_SHARP: - if (val) {BM_SetHFlag(e, BM_ELEM_SEAM);} - else {BM_ClearHFlag(e, BM_ELEM_SEAM);} + if (val) {BM_elem_flag_set(e, BM_ELEM_SEAM);} + else {BM_elem_flag_clear(e, BM_ELEM_SEAM);} break; case EDGE_MODE_TAG_CREASE: { @@ -1192,15 +1192,15 @@ static int edgetag_context_check(Scene *scene, BMEditMesh *em, BMEdge *e) { switch (scene->toolsettings->edge_mode) { case EDGE_MODE_SELECT: - return BM_TestHFlag(e, BM_ELEM_SELECT) ? 1 : 0; + return BM_elem_flag_test(e, BM_ELEM_SELECT) ? 1 : 0; case EDGE_MODE_TAG_SEAM: - return BM_TestHFlag(e, BM_ELEM_SEAM); + return BM_elem_flag_test(e, BM_ELEM_SEAM); case EDGE_MODE_TAG_SHARP: - return BM_TestHFlag(e, BM_ELEM_SHARP); + return BM_elem_flag_test(e, BM_ELEM_SHARP); case EDGE_MODE_TAG_CREASE: - return BM_GetCDf(&em->bm->edata, e, CD_CREASE) ? 1 : 0; + return BM_elem_float_data_get(&em->bm->edata, e, CD_CREASE) ? 1 : 0; case EDGE_MODE_TAG_BEVEL: - return BM_GetCDf(&em->bm->edata, e, CD_BWEIGHT) ? 1 : 0; + return BM_elem_float_data_get(&em->bm->edata, e, CD_BWEIGHT) ? 1 : 0; } return 0; } @@ -1218,15 +1218,15 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B BLI_smallhash_init(&visithash); /* note, would pass BM_EDGE except we are looping over all edges anyway */ - BM_ElemIndex_Ensure(em->bm, BM_VERT /* | BM_EDGE */); + BM_mesh_elem_index_ensure(em->bm, BM_VERT /* | BM_EDGE */); BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { e->head.flags[0].f = 0; - if (BM_TestHFlag(e, BM_ELEM_HIDDEN)) { + if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { BLI_smallhash_insert(&visithash, (uintptr_t)e, NULL); } - BM_SetIndex(e, totedge); /* set_inline */ + BM_elem_index_set(e, totedge); /* set_inline */ totedge++; } em->bm->elem_index_dirty &= ~BM_EDGE; @@ -1240,8 +1240,8 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B /* count edges, compute adjacent edges offsets and fill adjacent */ BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - nedges[BM_GetIndex(e->v1) + 1]++; - nedges[BM_GetIndex(e->v2) + 1]++; + nedges[BM_elem_index_get(e->v1) + 1]++; + nedges[BM_elem_index_get(e->v2) + 1]++; } for (i = 1; i < totvert; i++) { @@ -1253,8 +1253,8 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B i = 0; BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - edges[nedges[BM_GetIndex(e->v1) + 1]++] = i; - edges[nedges[BM_GetIndex(e->v2) + 1]++] = i; + edges[nedges[BM_elem_index_get(e->v1) + 1]++] = i; + edges[nedges[BM_elem_index_get(e->v2) + 1]++] = i; cost[i] = 1e20f; prevedge[i] = -1; @@ -1286,10 +1286,10 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B /* regular dijkstra shortest path, but over edges instead of vertices */ heap = BLI_heap_new(); - BLI_heap_insert(heap, 0.0f, SET_INT_IN_POINTER(BM_GetIndex(source))); - cost[BM_GetIndex(source)] = 0.0f; + BLI_heap_insert(heap, 0.0f, SET_INT_IN_POINTER(BM_elem_index_get(source))); + cost[BM_elem_index_get(source)] = 0.0f; EDBM_init_index_arrays(em, 1, 1, 0); - targetnum = BM_GetIndex(target); + targetnum = BM_elem_index_get(target); while (!BLI_heap_empty(heap)) { mednum = GET_INT_FROM_POINTER(BLI_heap_popmin(heap)); @@ -1303,8 +1303,8 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B BLI_smallhash_insert(&visithash, (uintptr_t)e, NULL); - edgetag_add_adjacent(em, &visithash, heap, mednum, BM_GetIndex(e->v1), nedges, edges, prevedge, cost); - edgetag_add_adjacent(em, &visithash, heap, mednum, BM_GetIndex(e->v2), nedges, edges, prevedge, cost); + edgetag_add_adjacent(em, &visithash, heap, mednum, BM_elem_index_get(e->v1), nedges, edges, prevedge, cost); + edgetag_add_adjacent(em, &visithash, heap, mednum, BM_elem_index_get(e->v2), nedges, edges, prevedge, cost); } if (mednum == targetnum) { @@ -1320,7 +1320,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B break; } mednum = prevedge[mednum]; - } while (mednum != BM_GetIndex(source)); + } while (mednum != BM_elem_index_get(source)); /* Follow path back and source and add or remove tags */ mednum = targetnum; @@ -1465,35 +1465,35 @@ int mouse_mesh(bContext *C, const int mval[2], short extend) if (efa) { /* set the last selected face */ - BM_set_actFace(vc.em->bm, efa); + BM_active_face_set(vc.em->bm, efa); - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) { EDBM_store_selection(vc.em, efa); - BM_Select(vc.em->bm, efa, TRUE); + BM_elem_select_set(vc.em->bm, efa, TRUE); } else if (extend) { EDBM_remove_selection(vc.em, efa); - BM_Select(vc.em->bm, efa, FALSE); + BM_elem_select_set(vc.em->bm, efa, FALSE); } } else if (eed) { - if (!BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if (!BM_elem_flag_test(eed, BM_ELEM_SELECT)) { EDBM_store_selection(vc.em, eed); - BM_Select(vc.em->bm, eed, TRUE); + BM_elem_select_set(vc.em->bm, eed, TRUE); } else if (extend) { EDBM_remove_selection(vc.em, eed); - BM_Select(vc.em->bm, eed, FALSE); + BM_elem_select_set(vc.em->bm, eed, FALSE); } } else if (eve) { - if (!BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (!BM_elem_flag_test(eve, BM_ELEM_SELECT)) { EDBM_store_selection(vc.em, eve); - BM_Select(vc.em->bm, eve, TRUE); + BM_elem_select_set(vc.em->bm, eve, TRUE); } else if (extend) { EDBM_remove_selection(vc.em, eve); - BM_Select(vc.em->bm, eve, FALSE); + BM_elem_select_set(vc.em->bm, eve, FALSE); } } @@ -1562,13 +1562,13 @@ void EDBM_selectmode_set(BMEditMesh *em) } else if (em->selectmode & SCE_SELECT_EDGE) { /* deselect vertices, and select again based on edge select */ - eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL); - for ( ; eve; eve = BMIter_Step(&iter)) BM_Select(em->bm, eve, FALSE); + eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL); + for ( ; eve; eve = BM_iter_step(&iter)) BM_elem_select_set(em->bm, eve, FALSE); - eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - for ( ; eed; eed = BMIter_Step(&iter)) { - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) { - BM_Select(em->bm, eed, TRUE); + eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + for ( ; eed; eed = BM_iter_step(&iter)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { + BM_elem_select_set(em->bm, eed, TRUE); } } @@ -1577,13 +1577,13 @@ void EDBM_selectmode_set(BMEditMesh *em) } else if (em->selectmode & SCE_SELECT_FACE) { /* deselect eges, and select again based on face select */ - eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - for ( ; eed; eed = BMIter_Step(&iter)) BM_Select(em->bm, eed, FALSE); + eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + for ( ; eed; eed = BM_iter_step(&iter)) BM_elem_select_set(em->bm, eed, FALSE); - efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); - for ( ; efa; efa = BMIter_Step(&iter)) { - if (BM_TestHFlag(efa, BM_ELEM_SELECT)) { - BM_Select(em->bm, efa, TRUE); + efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); + for ( ; efa; efa = BM_iter_step(&iter)) { + if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { + BM_elem_select_set(em->bm, efa, TRUE); } } } @@ -1599,12 +1599,12 @@ void EDBM_convertsel(BMEditMesh *em, short oldmode, short selectmode) if (oldmode == SCE_SELECT_VERTEX) { if (selectmode == SCE_SELECT_EDGE) { /* select all edges associated with every selected vertex */ - eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - for ( ; eed; eed = BMIter_Step(&iter)) { - if ( (BM_TestHFlag(eed->v1, BM_ELEM_SELECT) || - BM_TestHFlag(eed->v2, BM_ELEM_SELECT))) + eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + for ( ; eed; eed = BM_iter_step(&iter)) { + if ( (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || + BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))) { - BM_Select(em->bm, eed, TRUE); + BM_elem_select_set(em->bm, eed, TRUE); } } } @@ -1613,12 +1613,12 @@ void EDBM_convertsel(BMEditMesh *em, short oldmode, short selectmode) BMLoop *l; /* select all faces associated with every selected vertex */ - efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); - for ( ; efa; efa = BMIter_Step(&iter)) { - l = BMIter_New(&liter, em->bm, BM_LOOPS_OF_FACE, efa); - for (; l; l = BMIter_Step(&liter)) { - if (BM_TestHFlag(l->v, BM_ELEM_SELECT)) { - BM_Select(em->bm, efa, TRUE); + efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); + for ( ; efa; efa = BM_iter_step(&iter)) { + l = BM_iter_new(&liter, em->bm, BM_LOOPS_OF_FACE, efa); + for (; l; l = BM_iter_step(&liter)) { + if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) { + BM_elem_select_set(em->bm, efa, TRUE); break; } } @@ -1632,12 +1632,12 @@ void EDBM_convertsel(BMEditMesh *em, short oldmode, short selectmode) BMLoop *l; /* select all faces associated with every selected vertex */ - efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); - for ( ; efa; efa = BMIter_Step(&iter)) { - l = BMIter_New(&liter, em->bm, BM_LOOPS_OF_FACE, efa); - for (; l; l = BMIter_Step(&liter)) { - if (BM_TestHFlag(l->v, BM_ELEM_SELECT)) { - BM_Select(em->bm, efa, TRUE); + efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); + for ( ; efa; efa = BM_iter_step(&iter)) { + l = BM_iter_new(&liter, em->bm, BM_LOOPS_OF_FACE, efa); + for (; l; l = BM_iter_step(&liter)) { + if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) { + BM_elem_select_set(em->bm, efa, TRUE); break; } } @@ -1653,10 +1653,10 @@ void EDBM_deselect_by_material(struct BMEditMesh *em, const short index, const s BMFace *efa; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(efa, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; if (efa->mat_nr == index) { - BM_Select(em->bm, efa, select); + BM_elem_select_set(em->bm, efa, select); } } } @@ -1671,23 +1671,23 @@ void EDBM_select_swap(BMEditMesh *em) /* exported for UV */ if (em->bm->selectmode & SCE_SELECT_VERTEX) { BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) continue; - BM_Select(em->bm, eve, !BM_TestHFlag(eve, BM_ELEM_SELECT)); + BM_elem_select_set(em->bm, eve, !BM_elem_flag_test(eve, BM_ELEM_SELECT)); } } else if (em->selectmode & SCE_SELECT_EDGE) { BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(eed, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; - BM_Select(em->bm, eed, !BM_TestHFlag(eed, BM_ELEM_SELECT)); + BM_elem_select_set(em->bm, eed, !BM_elem_flag_test(eed, BM_ELEM_SELECT)); } } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(efa, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; - BM_Select(em->bm, efa, !BM_TestHFlag(efa, BM_ELEM_SELECT)); + BM_elem_select_set(em->bm, efa, !BM_elem_flag_test(efa, BM_ELEM_SELECT)); } } @@ -1755,21 +1755,21 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event if (limit) { BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(e, BM_ELEM_SEAM)) BMO_SetFlag(bm, e, BM_ELEM_SELECT); - else BMO_ClearFlag(bm, e, BM_ELEM_SELECT); /* is this needed ? */ + if (!BM_elem_flag_test(e, BM_ELEM_SEAM)) BMO_elem_flag_set(bm, e, BM_ELEM_SELECT); + else BMO_elem_flag_clear(bm, e, BM_ELEM_SELECT); /* is this needed ? */ } } /* walk */ - BMW_Init(&walker, bm, BMW_ISLAND, + BMW_init(&walker, bm, BMW_ISLAND, BMW_MASK_NOP, limit ? BM_ELEM_SELECT : BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); - e = BMW_Begin(&walker, efa); - for (; efa; efa = BMW_Step(&walker)) { - BM_Select(bm, efa, sel); + e = BMW_begin(&walker, efa); + for (; efa; efa = BMW_step(&walker)) { + BM_elem_select_set(bm, efa, sel); } - BMW_End(&walker); + BMW_end(&walker); } else { if (efa) { @@ -1782,15 +1782,15 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event eed = eve->e; } - BMW_Init(&walker, bm, BMW_SHELL, + BMW_init(&walker, bm, BMW_SHELL, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); - e = BMW_Begin(&walker, eed->v1); - for ( ; e; e = BMW_Step(&walker)) { - BM_Select(bm, e, sel); + e = BMW_begin(&walker, eed->v1); + for ( ; e; e = BMW_step(&walker)) { + BM_elem_select_set(bm, e, sel); } - BMW_End(&walker); + BMW_end(&walker); } WM_event_add_notifier(C, NC_GEOM|ND_SELECT, obedit); @@ -1836,58 +1836,58 @@ static int select_linked_exec(bContext *C, wmOperator *op) BMFace *efa; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(efa, BM_ELEM_SELECT) && !BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { - BM_SetHFlag(efa, BM_ELEM_TAG); + if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { + BM_elem_flag_set(efa, BM_ELEM_TAG); } else { - BM_ClearHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_clear(efa, BM_ELEM_TAG); } } if (limit) { BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(e, BM_ELEM_SEAM)) BMO_SetFlag(bm, e, BM_ELEM_SELECT); - else BMO_ClearFlag(bm, e, BM_ELEM_SELECT); /* is this needed ? */ + if (!BM_elem_flag_test(e, BM_ELEM_SEAM)) BMO_elem_flag_set(bm, e, BM_ELEM_SELECT); + else BMO_elem_flag_clear(bm, e, BM_ELEM_SELECT); /* is this needed ? */ } } - BMW_Init(&walker, bm, BMW_ISLAND, + BMW_init(&walker, bm, BMW_ISLAND, BMW_MASK_NOP, limit ? BM_ELEM_SELECT : BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(efa, BM_ELEM_TAG)) { - e = BMW_Begin(&walker, efa); - for (; efa; efa = BMW_Step(&walker)) { - BM_Select(bm, efa, TRUE); + if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { + e = BMW_begin(&walker, efa); + for (; efa; efa = BMW_step(&walker)) { + BM_elem_select_set(bm, efa, TRUE); } } } - BMW_End(&walker); + BMW_end(&walker); } else { BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT) && !BM_TestHFlag(v, BM_ELEM_HIDDEN)) { - BM_SetHFlag(v, BM_ELEM_TAG); + if (BM_elem_flag_test(v, BM_ELEM_SELECT) && !BM_elem_flag_test(v, BM_ELEM_HIDDEN)) { + BM_elem_flag_set(v, BM_ELEM_TAG); } else { - BM_ClearHFlag(v, BM_ELEM_TAG); + BM_elem_flag_clear(v, BM_ELEM_TAG); } } - BMW_Init(&walker, em->bm, BMW_SHELL, + BMW_init(&walker, em->bm, BMW_SHELL, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_TAG)) { - e = BMW_Begin(&walker, v); - for (; e; e = BMW_Step(&walker)) { - BM_Select(em->bm, e->v1, TRUE); - BM_Select(em->bm, e->v2, TRUE); + if (BM_elem_flag_test(v, BM_ELEM_TAG)) { + e = BMW_begin(&walker, v); + for (; e; e = BMW_step(&walker)) { + BM_elem_select_set(em->bm, e->v1, TRUE); + BM_elem_select_set(em->bm, e->v2, TRUE); } } } - BMW_End(&walker); + BMW_end(&walker); } EDBM_selectmode_flush_ex(em, SCE_SELECT_VERTEX); @@ -2011,24 +2011,24 @@ static void walker_deselect_nth(BMEditMesh *em, int nth, int offset, BMHeader *h * so transfer BM_ELEM_SELECT from HFlags onto a BMO flag layer. */ BMO_push(bm, NULL); BM_ITER(h, &iter, bm, itertype, NULL) { - if (BM_TestHFlag(h, BM_ELEM_SELECT)) { - BMO_SetFlag(bm, h, BM_ELEM_SELECT); + if (BM_elem_flag_test(h, BM_ELEM_SELECT)) { + BMO_elem_flag_set(bm, h, BM_ELEM_SELECT); } } /* Walk over selected elements starting at active */ - BMW_Init(&walker, bm, walktype, + BMW_init(&walker, bm, walktype, mask_vert, mask_edge, mask_loop, mask_face, BMW_NIL_LAY); BLI_assert(walker.order == BMW_BREADTH_FIRST); - for (h = BMW_Begin(&walker, h_act); h != NULL; h = BMW_Step(&walker)) { + for (h = BMW_begin(&walker, h_act); h != NULL; h = BMW_step(&walker)) { /* Deselect elements that aren't at "nth" depth from active */ - if ((offset + BMW_CurrentDepth(&walker)) % nth) { - BM_Select(bm, h, FALSE); + if ((offset + BMW_current_depth(&walker)) % nth) { + BM_elem_select_set(bm, h, FALSE); } } - BMW_End(&walker); + BMW_end(&walker); BMO_pop(bm); @@ -2067,7 +2067,7 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **v_p, BMEdge **e_p, BMFa if (em->selectmode & SCE_SELECT_VERTEX) { BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { *v_p = v; return; } @@ -2075,14 +2075,14 @@ static void deselect_nth_active(BMEditMesh *em, BMVert **v_p, BMEdge **e_p, BMFa } else if (em->selectmode & SCE_SELECT_EDGE) { BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { *e_p = e; return; } } } else if (em->selectmode & SCE_SELECT_FACE) { - f = BM_get_actFace(em->bm, TRUE); + f = BM_active_face_get(em->bm, TRUE); if (f) { *f_p = f; return; @@ -2188,7 +2188,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) sharp = DEG2RADF(sharp); BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_HIDDEN) || !e->l) + if (BM_elem_flag_test(e, BM_ELEM_HIDDEN) || !e->l) continue; l1 = e->l; @@ -2201,7 +2201,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) angle = angle_normalized_v3v3(l1->f->no, l2->f->no); if (fabsf(angle) > sharp) { - BM_Select(em->bm, e, TRUE); + BM_elem_select_set(em->bm, e, TRUE); } } @@ -2243,11 +2243,11 @@ static int select_linked_flat_faces_exec(bContext *C, wmOperator *op) sharp = (sharp * M_PI) / 180.0; BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - BM_ClearHFlag(f, BM_ELEM_TAG); + BM_elem_flag_clear(f, BM_ELEM_TAG); } BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(f, BM_ELEM_HIDDEN) || !BM_TestHFlag(f, BM_ELEM_SELECT) || BM_TestHFlag(f, BM_ELEM_TAG)) + if (BM_elem_flag_test(f, BM_ELEM_HIDDEN) || !BM_elem_flag_test(f, BM_ELEM_SELECT) || BM_elem_flag_test(f, BM_ELEM_TAG)) continue; BLI_array_empty(stack); @@ -2260,15 +2260,15 @@ static int select_linked_flat_faces_exec(bContext *C, wmOperator *op) f = stack[i - 1]; i--; - BM_Select(em->bm, f, TRUE); + BM_elem_select_set(em->bm, f, TRUE); - BM_SetHFlag(f, BM_ELEM_TAG); + BM_elem_flag_set(f, BM_ELEM_TAG); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { BM_ITER(l2, &liter2, em->bm, BM_LOOPS_OF_LOOP, l) { float angle; - if (BM_TestHFlag(l2->f, BM_ELEM_TAG) || BM_TestHFlag(l2->f, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(l2->f, BM_ELEM_TAG) || BM_elem_flag_test(l2->f, BM_ELEM_HIDDEN)) continue; /* edge has exactly two neighboring faces, check angle */ @@ -2328,14 +2328,14 @@ static int select_non_manifold_exec(bContext *C, wmOperator *op) } BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(em->bm, BM_ELEM_HIDDEN) && BM_Nonmanifold_Vert(em->bm, v)) { - BM_Select(em->bm, v, TRUE); + if (!BM_elem_flag_test(em->bm, BM_ELEM_HIDDEN) && BM_vert_is_nonmanifold(em->bm, v)) { + BM_elem_select_set(em->bm, v, TRUE); } } BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(em->bm, BM_ELEM_HIDDEN) && BM_Edge_FaceCount(e) != 2) { - BM_Select(em->bm, e, TRUE); + if (!BM_elem_flag_test(em->bm, BM_ELEM_HIDDEN) && BM_edge_face_count(e) != 2) { + BM_elem_select_set(em->bm, e, TRUE); } } @@ -2376,24 +2376,24 @@ static int mesh_select_random_exec(bContext *C, wmOperator *op) if (em->selectmode & SCE_SELECT_VERTEX) { BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { - BM_Select(em->bm, eve, TRUE); + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { + BM_elem_select_set(em->bm, eve, TRUE); } } EDBM_selectmode_flush(em); } else if (em->selectmode & SCE_SELECT_EDGE) { BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { - BM_Select(em->bm, eed, TRUE); + if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { + BM_elem_select_set(em->bm, eed, TRUE); } } EDBM_selectmode_flush(em); } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { - BM_Select(em->bm, efa, TRUE); + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BLI_frand() < randfac) { + BM_elem_select_set(em->bm, efa, TRUE); } } EDBM_selectmode_flush(em); @@ -2434,7 +2434,7 @@ static int select_next_loop(bContext *C, wmOperator *UNUSED(op)) BMIter iter; BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - BM_ClearHFlag(v, BM_ELEM_TAG); + BM_elem_flag_clear(v, BM_ELEM_TAG); } BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { @@ -2442,16 +2442,16 @@ static int select_next_loop(bContext *C, wmOperator *UNUSED(op)) BMIter liter; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { - if (BM_TestHFlag(l->v, BM_ELEM_SELECT) && !BM_TestHFlag(l->v, BM_ELEM_HIDDEN)) { - BM_SetHFlag(l->next->v, BM_ELEM_TAG); - BM_Select(em->bm, l->v, FALSE); + if (BM_elem_flag_test(l->v, BM_ELEM_SELECT) && !BM_elem_flag_test(l->v, BM_ELEM_HIDDEN)) { + BM_elem_flag_set(l->next->v, BM_ELEM_TAG); + BM_elem_select_set(em->bm, l->v, FALSE); } } } BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_TAG)) { - BM_Select(em->bm, v, TRUE); + if (BM_elem_flag_test(v, BM_ELEM_TAG)) { + BM_elem_select_set(em->bm, v, TRUE); } } @@ -2487,7 +2487,7 @@ static int region_to_loop(bContext *C, wmOperator *UNUSED(op)) em_setup_viewcontext(C, &vc); BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - BM_ClearHFlag(e, BM_ELEM_TAG); + BM_elem_flag_clear(e, BM_ELEM_TAG); } BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { @@ -2499,19 +2499,19 @@ static int region_to_loop(bContext *C, wmOperator *UNUSED(op)) BM_ITER(l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) { tot++; - totsel += BM_TestHFlag(l2->f, BM_ELEM_SELECT) != 0; + totsel += BM_elem_flag_test(l2->f, BM_ELEM_SELECT) != 0; } if ((tot != totsel && totsel > 0) || (totsel == 1 && tot == 1)) - BM_SetHFlag(l1->e, BM_ELEM_TAG); + BM_elem_flag_set(l1->e, BM_ELEM_TAG); } } EDBM_clear_flag_all(em, BM_ELEM_SELECT); BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_TAG) && !BM_TestHFlag(e, BM_ELEM_HIDDEN)) - BM_Select_Edge(em->bm, e, TRUE); + if (BM_elem_flag_test(e, BM_ELEM_TAG) && !BM_elem_flag_test(e, BM_ELEM_HIDDEN)) + BM_edge_select(em->bm, e, TRUE); } /* If in face-only select mode, switch to edge select mode so that @@ -2560,7 +2560,7 @@ static int loop_find_region(BMEditMesh *em, BMLoop *l, int flag, BLI_array_append(region, f); BM_ITER(l1, &liter1, em->bm, BM_LOOPS_OF_FACE, f) { - if (BM_TestHFlag(l1->e, flag)) + if (BM_elem_flag_test(l1->e, flag)) continue; BM_ITER(l2, &liter2, em->bm, BM_LOOPS_OF_EDGE, l1->e) { @@ -2585,8 +2585,8 @@ static int verg_radial(const void *va, const void *vb) BMEdge *e2 = *((void **)vb); int a, b; - a = BM_Edge_FaceCount(e1); - b = BM_Edge_FaceCount(e2); + a = BM_edge_face_count(e1); + b = BM_edge_face_count(e2); if (a > b) return -1; if (a == b) return 0; @@ -2607,16 +2607,16 @@ static int loop_find_regions(BMEditMesh *em, int selbigger) BLI_smallhash_init(&visithash); BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - BM_ClearHFlag(f, BM_ELEM_TAG); + BM_elem_flag_clear(f, BM_ELEM_TAG); } BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { BLI_array_append(edges, e); - BM_SetHFlag(e, BM_ELEM_TAG); + BM_elem_flag_set(e, BM_ELEM_TAG); } else { - BM_ClearHFlag(e, BM_ELEM_TAG); + BM_elem_flag_clear(e, BM_ELEM_TAG); } } @@ -2631,7 +2631,7 @@ static int loop_find_regions(BMEditMesh *em, int selbigger) e = edges[i]; - if (!BM_TestHFlag(e, BM_ELEM_TAG)) + if (!BM_elem_flag_test(e, BM_ELEM_TAG)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_EDGE, e) { @@ -2660,9 +2660,9 @@ static int loop_find_regions(BMEditMesh *em, int selbigger) int j; for (j = 0; j < tot; j++) { - BM_SetHFlag(region[j], BM_ELEM_TAG); + BM_elem_flag_set(region[j], BM_ELEM_TAG); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, region[j]) { - BM_ClearHFlag(l->e, BM_ELEM_TAG); + BM_elem_flag_clear(l->e, BM_ELEM_TAG); } } @@ -2698,8 +2698,8 @@ static int loop_to_region(bContext *C, wmOperator *op) EDBM_clear_flag_all(em, BM_ELEM_SELECT); BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(f, BM_ELEM_TAG) && !BM_TestHFlag(f, BM_ELEM_HIDDEN)) { - BM_Select_Face(em->bm, f, TRUE); + if (BM_elem_flag_test(f, BM_ELEM_TAG) && !BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { + BM_face_select(em->bm, f, TRUE); } } diff --git a/source/blender/editors/mesh/bmesh_selecthistory.c b/source/blender/editors/mesh/bmesh_selecthistory.c index 5a1fdeebdbc..a242356f1ab 100644 --- a/source/blender/editors/mesh/bmesh_selecthistory.c +++ b/source/blender/editors/mesh/bmesh_selecthistory.c @@ -55,15 +55,15 @@ void EDBM_editselection_plane(BMEditMesh *em, float *plane, BMEditSelection *ese void EDBM_remove_selection(BMEditMesh *em, void *data) { - BM_remove_selection(em->bm, data); + BM_select_history_remove(em->bm, data); } void EDBM_store_selection(BMEditMesh *em, void *data) { - BM_store_selection(em->bm, data); + BM_select_history_store(em->bm, data); } void EDBM_validate_selections(BMEditMesh *em) { - BM_validate_selections(em->bm); + BM_select_history_validate(em->bm); } diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index 2d274526110..c7a3fc14dbd 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -150,7 +150,7 @@ void EMBM_project_snap_verts(bContext *C, ARegion *ar, Object *obedit, BMEditMes BMVert *eve; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { float mval[2], vec[3], no_dummy[3]; int dist_dummy; mul_v3_m4v3(vec, obedit->obmat, eve->co); @@ -178,10 +178,10 @@ static short EDBM_Extrude_face_indiv(BMEditMesh *em, wmOperator *op, const char /* deselect original verts */ EDBM_clear_flag_all(em, BM_ELEM_SELECT); - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); BMO_ITER(f, &siter, em->bm, &bmop, "faceout", BM_FACE) { - BM_Select(em->bm, f, TRUE); + BM_elem_select_set(em->bm, f, TRUE); /* set face vertex normals to face normal */ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { @@ -206,8 +206,8 @@ static short EDBM_Extrude_edges_indiv(BMEditMesh *em, wmOperator *op, const char /* deselect original verts */ EDBM_clear_flag_all(em, BM_ELEM_SELECT); - BMO_Exec_Op(em->bm, &bmop); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_VERT|BM_EDGE); + BMO_op_exec(em->bm, &bmop); + BMO_slot_buffer_hflag(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_VERT|BM_EDGE); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return 0; @@ -224,10 +224,10 @@ static short EDBM_Extrude_verts_indiv(BMEditMesh *em, wmOperator *op, const char EDBM_InitOpf(em, &bmop, op, "extrude_vert_indiv verts=%hv", hflag); /* deselect original verts */ - BMO_UnHeaderFlag_Buffer(em->bm, &bmop, "verts", BM_ELEM_SELECT, BM_VERT); + BMO_slot_buffer_hflag_clear(em->bm, &bmop, "verts", BM_ELEM_SELECT, BM_VERT); - BMO_Exec_Op(em->bm, &bmop); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "vertout", BM_ELEM_SELECT, BM_VERT); + BMO_op_exec(em->bm, &bmop); + BMO_slot_buffer_hflag(em->bm, &bmop, "vertout", BM_ELEM_SELECT, BM_VERT); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return 0; @@ -247,8 +247,8 @@ static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, ModifierData *md; BMHeader *el; - BMO_Init_Op(bm, &extop, "extrudefaceregion"); - BMO_HeaderFlag_To_Slot(bm, &extop, "edgefacein", + BMO_op_init(bm, &extop, "extrudefaceregion"); + BMO_slot_from_hflag(bm, &extop, "edgefacein", hflag, BM_VERT|BM_EDGE|BM_FACE); /* If a mirror modifier with clipping is on, we need to adjust some @@ -267,11 +267,11 @@ static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, mult_m4_m4m4(mtx, imtx, obedit->obmat); } - for (edge = BMIter_New(&iter, bm, BM_EDGES_OF_MESH, NULL); + for (edge = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL); edge; - edge = BMIter_Step(&iter)) + edge = BM_iter_step(&iter)) { - if (BM_TestHFlag(edge, hflag)) { + if (BM_elem_flag_test(edge, hflag)) { float co1[3], co2[3]; copy_v3_v3(co1, edge->v1->co); @@ -286,21 +286,21 @@ static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, if ( (fabs(co1[0]) < mmd->tolerance) && (fabs(co2[0]) < mmd->tolerance) ) { - BMO_Insert_MapPointer(bm, &extop, "exclude", edge, NULL); + BMO_slot_map_ptr_insert(bm, &extop, "exclude", edge, NULL); } } if (mmd->flag & MOD_MIR_AXIS_Y) { if ( (fabs(co1[1]) < mmd->tolerance) && (fabs(co2[1]) < mmd->tolerance) ) { - BMO_Insert_MapPointer(bm, &extop, "exclude", edge, NULL); + BMO_slot_map_ptr_insert(bm, &extop, "exclude", edge, NULL); } } if (mmd->flag & MOD_MIR_AXIS_Z) { if ( (fabs(co1[2]) < mmd->tolerance) && (fabs(co2[2]) < mmd->tolerance) ) { - BMO_Insert_MapPointer(bm, &extop, "exclude", edge, NULL); + BMO_slot_map_ptr_insert(bm, &extop, "exclude", edge, NULL); } } } @@ -311,12 +311,12 @@ static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, EDBM_clear_flag_all(em, BM_ELEM_SELECT); - BMO_Exec_Op(bm, &extop); + BMO_op_exec(bm, &extop); nor[0] = nor[1] = nor[2] = 0.0f; BMO_ITER(el, &siter, bm, &extop, "geomout", BM_ALL) { - BM_Select(bm, el, TRUE); + BM_elem_select_set(bm, el, TRUE); if (el->htype == BM_FACE) { f = (BMFace *)el; @@ -326,7 +326,7 @@ static short EDBM_Extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, normalize_v3(nor); - BMO_Finish_Op(bm, &extop); + BMO_op_finish(bm, &extop); if (nor[0] == 0.0f && nor[1] == 0.0f && nor[2] == 0.0f) return 'g'; // grab return 'n'; // normal constraint @@ -338,24 +338,24 @@ static short EDBM_Extrude_vert(Object *obedit, BMEditMesh *em, const char hflag, BMEdge *eed; /* ensure vert flags are consistent for edge selections */ - eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - for ( ; eed; eed = BMIter_Step(&iter)) { - if (BM_TestHFlag(eed, hflag)) { + eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + for ( ; eed; eed = BM_iter_step(&iter)) { + if (BM_elem_flag_test(eed, hflag)) { if (hflag & BM_ELEM_SELECT) { - BM_Select(em->bm, eed->v1, TRUE); - BM_Select(em->bm, eed->v2, TRUE); + BM_elem_select_set(em->bm, eed->v1, TRUE); + BM_elem_select_set(em->bm, eed->v2, TRUE); } - BM_SetHFlag(eed->v1, hflag & ~BM_ELEM_SELECT); - BM_SetHFlag(eed->v2, hflag & ~BM_ELEM_SELECT); + BM_elem_flag_set(eed->v1, hflag & ~BM_ELEM_SELECT); + BM_elem_flag_set(eed->v2, hflag & ~BM_ELEM_SELECT); } else { - if (BM_TestHFlag(eed->v1, hflag) && BM_TestHFlag(eed->v2, hflag)) { + if (BM_elem_flag_test(eed->v1, hflag) && BM_elem_flag_test(eed->v2, hflag)) { if (hflag & BM_ELEM_SELECT) { - BM_Select(em->bm, eed, TRUE); + BM_elem_select_set(em->bm, eed, TRUE); } - BM_SetHFlag(eed, hflag & ~BM_ELEM_SELECT); + BM_elem_flag_set(eed, hflag & ~BM_ELEM_SELECT); } } } @@ -386,8 +386,8 @@ static int extrude_repeat_mesh(bContext *C, wmOperator *op) for (a = 0; a < steps; a++) { EDBM_Extrude_edge(obedit, em, BM_ELEM_SELECT, nor); - //BMO_CallOpf(em->bm, "extrudefaceregion edgefacein=%hef", BM_ELEM_SELECT); - BMO_CallOpf(em->bm, "translate vec=%v verts=%hv", (float *)dvec, BM_ELEM_SELECT); + //BMO_op_callf(em->bm, "extrudefaceregion edgefacein=%hef", BM_ELEM_SELECT); + BMO_op_callf(em->bm, "translate vec=%v verts=%hv", (float *)dvec, BM_ELEM_SELECT); //extrudeflag(obedit, em, SELECT, nor); //translateflag(em, SELECT, dvec); } @@ -698,7 +698,7 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event) INIT_MINMAX(min, max); BM_ITER(v1, &iter, vc.em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v1, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(v1, BM_ELEM_SELECT)) { DO_MINMAX(v1->co, min, max); done = 1; } @@ -720,7 +720,7 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event) /* check for edges that are half selected, use for rotation */ done = 0; BM_ITER(eed, &iter, vc.em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { float co1[3], co2[3]; mul_v3_m4v3(co1, vc.obedit->obmat, eed->v1->co); mul_v3_m4v3(co2, vc.obedit->obmat, eed->v2->co); @@ -824,10 +824,10 @@ static int dupli_extrude_cursor(bContext *C, wmOperator *op, wmEvent *event) mul_m4_v3(vc.obedit->imat, min); // back in object space EDBM_InitOpf(vc.em, &bmop, op, "makevert co=%v", min); - BMO_Exec_Op(vc.em->bm, &bmop); + BMO_op_exec(vc.em->bm, &bmop); BMO_ITER(v1, &oiter, vc.em->bm, &bmop, "newvertout", BM_VERT) { - BM_Select(vc.em->bm, v1, TRUE); + BM_elem_select_set(vc.em->bm, v1, TRUE); } if (!EDBM_FinishOp(vc.em, &bmop, op, TRUE)) { @@ -998,8 +998,8 @@ static int addedgeface_mesh_exec(bContext *C, wmOperator *op) if (!EDBM_InitOpf(em, &bmop, op, "contextual_create geom=%hfev", BM_ELEM_SELECT)) return OPERATOR_CANCELLED; - BMO_Exec_Op(em->bm, &bmop); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "faceout", BM_ELEM_SELECT, BM_FACE); + BMO_op_exec(em->bm, &bmop); + BMO_slot_buffer_hflag(em->bm, &bmop, "faceout", BM_ELEM_SELECT, BM_FACE); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; @@ -1045,17 +1045,17 @@ static int editbmesh_mark_seam(bContext *C, wmOperator *op) if (clear) { BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(eed, BM_ELEM_SELECT) || BM_TestHFlag(eed, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; - BM_ClearHFlag(eed, BM_ELEM_SEAM); + BM_elem_flag_clear(eed, BM_ELEM_SEAM); } } else { BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(eed, BM_ELEM_SELECT) || BM_TestHFlag(eed, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; - BM_SetHFlag(eed, BM_ELEM_SEAM); + BM_elem_flag_set(eed, BM_ELEM_SEAM); } } @@ -1099,18 +1099,18 @@ static int editbmesh_mark_sharp(bContext *C, wmOperator *op) if (!clear) { BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(eed, BM_ELEM_SELECT) || BM_TestHFlag(eed, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; - BM_SetHFlag(eed, BM_ELEM_SHARP); + BM_elem_flag_set(eed, BM_ELEM_SHARP); } } else { BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(eed, BM_ELEM_SELECT) || BM_TestHFlag(eed, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(eed, BM_ELEM_SELECT) || BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) continue; - BM_ClearHFlag(eed, BM_ELEM_SHARP); + BM_elem_flag_clear(eed, BM_ELEM_SHARP); } } @@ -1150,8 +1150,8 @@ static int editbmesh_vert_connect(bContext *C, wmOperator *op) if (!EDBM_InitOpf(em, &bmop, op, "connectverts verts=%hv", BM_ELEM_SELECT)) { return OPERATOR_CANCELLED; } - BMO_Exec_Op(bm, &bmop); - len = BMO_GetSlot(&bmop, "edgeout")->len; + BMO_op_exec(bm, &bmop); + len = BMO_slot_get(&bmop, "edgeout")->len; if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; } @@ -1188,8 +1188,8 @@ static int editbmesh_edge_split(bContext *C, wmOperator *op) BM_ELEM_SELECT, RNA_int_get(op->ptr,"number_cuts"))) { return OPERATOR_CANCELLED; } - BMO_Exec_Op(bm, &bmop); - len = BMO_GetSlot(&bmop, "outsplit")->len; + BMO_op_exec(bm, &bmop); + len = BMO_slot_get(&bmop, "outsplit")->len; if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; } @@ -1226,10 +1226,10 @@ static int mesh_duplicate_exec(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "dupe geom=%hvef", BM_ELEM_SELECT); - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); EDBM_clear_flag_all(em, BM_ELEM_SELECT); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "newout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(em->bm, &bmop, "newout", BM_ELEM_SELECT, BM_ALL); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; @@ -1326,9 +1326,9 @@ static int edge_rotate_selected(bContext *C, wmOperator *op) /* first see if we have two adjacent faces */ BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_Edge_FaceCount(eed) == 2) { - if ((BM_TestHFlag(eed->l->f, BM_ELEM_SELECT) && BM_TestHFlag(eed->l->radial_next->f, BM_ELEM_SELECT)) - && !(BM_TestHFlag(eed->l->f, BM_ELEM_HIDDEN) || BM_TestHFlag(eed->l->radial_next->f, BM_ELEM_HIDDEN))) + if (BM_edge_face_count(eed) == 2) { + if ((BM_elem_flag_test(eed->l->f, BM_ELEM_SELECT) && BM_elem_flag_test(eed->l->radial_next->f, BM_ELEM_SELECT)) + && !(BM_elem_flag_test(eed->l->f, BM_ELEM_HIDDEN) || BM_elem_flag_test(eed->l->radial_next->f, BM_ELEM_HIDDEN))) { break; } @@ -1344,7 +1344,7 @@ static int edge_rotate_selected(bContext *C, wmOperator *op) if (!eed) { BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(eed, BM_ELEM_SELECT) && !BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { /* de-select the edge before */ do_deselect = TRUE; break; @@ -1361,10 +1361,10 @@ static int edge_rotate_selected(bContext *C, wmOperator *op) /* avoid adding to the selection if we start off with only a selected edge, * we could also just deselect the single edge easily but use the BMO api * since it seems this is more 'correct' */ - if (do_deselect) BMO_UnHeaderFlag_Buffer(em->bm, &bmop, "edges", BM_ELEM_SELECT, BM_EDGE); + if (do_deselect) BMO_slot_buffer_hflag_clear(em->bm, &bmop, "edges", BM_ELEM_SELECT, BM_EDGE); - BMO_Exec_Op(em->bm, &bmop); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "edgeout", BM_ELEM_SELECT, BM_EDGE); + BMO_op_exec(em->bm, &bmop); + BMO_slot_buffer_hflag(em->bm, &bmop, "edgeout", BM_ELEM_SELECT, BM_EDGE); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; @@ -1411,8 +1411,8 @@ void EDBM_hide_mesh(BMEditMesh *em, int swap) itermode = BM_FACES_OF_MESH; BM_ITER(h, &iter, em->bm, itermode, NULL) { - if (BM_TestHFlag(h, BM_ELEM_SELECT) ^ swap) - BM_Hide(em->bm, h, TRUE); + if (BM_elem_flag_test(h, BM_ELEM_SELECT) ^ swap) + BM_elem_hide_set(em->bm, h, TRUE); } EDBM_selectmode_flush(em); @@ -1477,11 +1477,11 @@ void EDBM_reveal_mesh(BMEditMesh *em) /* Use index field to remember what was hidden before all is revealed. */ for (i = 0; i < 3; i++) { BM_ITER(ele, &iter, em->bm, iter_types[i], NULL) { - if (BM_TestHFlag(ele, BM_ELEM_HIDDEN)) { - BM_SetHFlag(ele, BM_ELEM_TAG); + if (BM_elem_flag_test(ele, BM_ELEM_HIDDEN)) { + BM_elem_flag_set(ele, BM_ELEM_TAG); } else { - BM_ClearHFlag(ele, BM_ELEM_TAG); + BM_elem_flag_clear(ele, BM_ELEM_TAG); } } } @@ -1496,8 +1496,8 @@ void EDBM_reveal_mesh(BMEditMesh *em) } BM_ITER(ele, &iter, em->bm, iter_types[i], NULL) { - if (BM_TestHFlag(ele, BM_ELEM_TAG)) { - BM_Select(em->bm, ele, TRUE); + if (BM_elem_flag_test(ele, BM_ELEM_TAG)) { + BM_elem_select_set(em->bm, ele, TRUE); } } } @@ -1660,11 +1660,11 @@ static int bm_test_exec(bContext *C, wmOperator *UNUSED(op)) /* hide all back edges */ BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(e, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(e, BM_ELEM_SELECT)) continue; if (!BMBVH_EdgeVisible(tree, e, ar, v3d, obedit)) - BM_Select(em->bm, e, FALSE); + BM_elem_select_set(em->bm, e, FALSE); } BMBVH_FreeBVH(tree); @@ -1683,14 +1683,14 @@ static int bm_test_exec(bContext *C, wmOperator *UNUSED(op)) } } - BMW_Init(&walker, em->bm, BMW_UVISLAND, BMW_NIL_LAY); + BMW_init(&walker, em->bm, BMW_UVISLAND, BMW_NIL_LAY); BM_ITER(f, &iter, em->bm, BM_FACES_OF_MESH, NULL) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, f) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_VERTSEL) { - l2 = BMW_Begin(&walker, l); - for (; l2; l2 = BMW_Step(&walker)) { + l2 = BMW_begin(&walker, l); + for (; l2; l2 = BMW_step(&walker)) { luv = CustomData_bmesh_get(&em->bm->ldata, l2->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } @@ -1698,7 +1698,7 @@ static int bm_test_exec(bContext *C, wmOperator *UNUSED(op)) } } - BMW_End(&walker); + BMW_end(&walker); #endif DAG_id_tag_update(obedit->data, OB_RECALC_DATA); WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data); @@ -1732,11 +1732,11 @@ static void mesh_set_smooth_faces(BMEditMesh *em, short smooth) if (em == NULL) return; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) { if (smooth) - BM_SetHFlag(efa, BM_ELEM_SMOOTH); + BM_elem_flag_set(efa, BM_ELEM_SMOOTH); else - BM_ClearHFlag(efa, BM_ELEM_SMOOTH); + BM_elem_flag_clear(efa, BM_ELEM_SMOOTH); } } } @@ -1819,7 +1819,7 @@ static int mesh_rotate_uvs(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "meshrotateuvs faces=%hf dir=%d", BM_ELEM_SELECT, dir); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* finish the operator */ if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { @@ -1844,7 +1844,7 @@ static int mesh_reverse_uvs(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "meshreverseuvs faces=%hf", BM_ELEM_SELECT); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* finish the operator */ if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { @@ -1872,7 +1872,7 @@ static int mesh_rotate_colors(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "meshrotatecolors faces=%hf dir=%d", BM_ELEM_SELECT, dir); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* finish the operator */ if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { @@ -1900,7 +1900,7 @@ static int mesh_reverse_colors(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "meshreversecolors faces=%hf", BM_ELEM_SELECT); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* finish the operator */ if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { @@ -1999,7 +1999,7 @@ static int merge_firstlast(BMEditMesh *em, int first, int uvmerge, wmOperator *w mergevert = (BMVert *)ese->data; } - if (!BM_TestHFlag(mergevert, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(mergevert, BM_ELEM_SELECT)) return OPERATOR_CANCELLED; if (uvmerge) { @@ -2029,7 +2029,7 @@ static int merge_target(BMEditMesh *em, Scene *scene, View3D *v3d, Object *ob, float fac; int i = 0; BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(v, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(v, BM_ELEM_SELECT)) continue; add_v3_v3(cent, v->co); i++; @@ -2175,12 +2175,12 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "finddoubles verts=%hv dist=%f", BM_ELEM_SELECT, RNA_float_get(op->ptr, "mergedist")); - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); - /* count = BMO_CountSlotMap(em->bm, &bmop, "targetmapout"); */ /* UNUSED */ + /* count = BMO_slot_map_count(em->bm, &bmop, "targetmapout"); */ /* UNUSED */ if (!EDBM_CallOpf(em, op, "weldverts targetmap=%s", &bmop, "targetmapout")) { - BMO_Finish_Op(em->bm, &bmop); + BMO_op_finish(em->bm, &bmop); return OPERATOR_CANCELLED; } @@ -2262,13 +2262,13 @@ static int select_vertex_path_exec(bContext *C, wmOperator *op) EDBM_InitOpf(em, &bmop, op, "vertexshortestpath startv=%e endv=%e type=%d", sv->data, ev->data, type); /* execute the operator */ - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* DO NOT clear the existing selection */ /* EDBM_clear_flag_all(em, BM_ELEM_SELECT); */ /* select the output */ - BMO_HeaderFlag_Buffer(em->bm, &bmop, "vertout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(em->bm, &bmop, "vertout", BM_ELEM_SELECT, BM_ALL); /* finish the operator */ if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { @@ -2348,11 +2348,11 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) ED_view3d_ob_project_mat_get(rv3d, obedit, projectMat); BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { - BM_SetHFlag(e, BM_ELEM_TAG); + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { + BM_elem_flag_set(e, BM_ELEM_TAG); } else { - BM_ClearHFlag(e, BM_ELEM_TAG); + BM_elem_flag_clear(e, BM_ELEM_TAG); } } @@ -2364,7 +2364,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) /* find selected vert */ BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT)) + if (BM_elem_flag_test(v, BM_ELEM_SELECT)) break; } @@ -2391,25 +2391,25 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_CANCELLED; /* rip two adjacent edges */ - if (BM_Edge_FaceCount(e2) == 1 || BM_Vert_FaceCount(v) == 2) { + if (BM_edge_face_count(e2) == 1 || BM_vert_face_count(v) == 2) { l = e2->l; - ripvert = BM_Rip_Vertex(bm, l->f, v); + ripvert = BM_vert_rip(bm, l->f, v); BLI_assert(ripvert); if (!ripvert) { return OPERATOR_CANCELLED; } } - else if (BM_Edge_FaceCount(e2) == 2) { + else if (BM_edge_face_count(e2) == 2) { l = e2->l; - e = BM_OtherFaceLoop(e2, l->f, v)->e; - BM_SetHFlag(e, BM_ELEM_TAG); - BM_Select(bm, e, TRUE); + e = BM_face_other_loop(e2, l->f, v)->e; + BM_elem_flag_set(e, BM_ELEM_TAG); + BM_elem_select_set(bm, e, TRUE); l = e2->l->radial_next; - e = BM_OtherFaceLoop(e2, l->f, v)->e; - BM_SetHFlag(e, BM_ELEM_TAG); - BM_Select(bm, e, TRUE); + e = BM_face_other_loop(e2, l->f, v)->e; + BM_elem_flag_set(e, BM_ELEM_TAG); + BM_elem_select_set(bm, e, TRUE); } dist = FLT_MAX; @@ -2420,19 +2420,19 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) e2 = NULL; i = 0; BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, v) { - if (BM_TestHFlag(e, BM_ELEM_TAG)) { + if (BM_elem_flag_test(e, BM_ELEM_TAG)) { e2 = e; i++; } } if (i == 1 && e2->l) { - l = BM_OtherFaceLoop(e2, e2->l->f, v); + l = BM_face_other_loop(e2, e2->l->f, v); l = l->radial_next; - l = BM_OtherFaceLoop(l->e, l->f, v); + l = BM_face_other_loop(l->e, l->f, v); if (l) { - BM_Select(bm, l->e, TRUE); + BM_elem_select_set(bm, l->e, TRUE); } } } @@ -2442,7 +2442,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_CANCELLED; } - BMO_Exec_Op(bm, &bmop); + BMO_op_exec(bm, &bmop); /* build bvh tree for edge visibility tests */ bvhtree = BMBVH_NewBVH(em, 0, NULL, NULL); @@ -2486,14 +2486,14 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) BMBVH_FreeBVH(bvhtree); EDBM_clear_flag_all(em, BM_ELEM_SELECT); - BMO_HeaderFlag_Buffer(bm, &bmop, side?"edgeout2":"edgeout1", BM_ELEM_SELECT, BM_EDGE); + BMO_slot_buffer_hflag(bm, &bmop, side?"edgeout2":"edgeout1", BM_ELEM_SELECT, BM_EDGE); BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { - BM_SetHFlag(e, BM_ELEM_TAG); + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { + BM_elem_flag_set(e, BM_ELEM_TAG); } else { - BM_ClearHFlag(e, BM_ELEM_TAG); + BM_elem_flag_clear(e, BM_ELEM_TAG); } } @@ -2502,7 +2502,7 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) e2 = NULL; i = 0; BM_ITER(e, &eiter, bm, BM_EDGES_OF_VERT, v) { - if (BM_TestHFlag(e, BM_ELEM_TAG)) { + if (BM_elem_flag_test(e, BM_ELEM_TAG)) { e2 = e; i++; } @@ -2510,14 +2510,14 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) if (i == 1) { if (singlesel) - BM_Select(bm, v, FALSE); + BM_elem_select_set(bm, v, FALSE); else - BM_Select(bm, e2, FALSE); + BM_elem_select_set(bm, e2, FALSE); } } if (ripvert) { - BM_Select(bm, ripvert, TRUE); + BM_elem_select_set(bm, ripvert, TRUE); } EDBM_selectmode_flush(em); @@ -2572,7 +2572,7 @@ static void shape_propagate(Object *obedit, BMEditMesh *em, wmOperator *op) } BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(eve, BM_ELEM_SELECT) || BM_TestHFlag(eve, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(eve, BM_ELEM_SELECT) || BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) continue; for (i = 0; i < totshape; i++) { @@ -2644,7 +2644,7 @@ static int blend_from_shape_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(eve, BM_ELEM_SELECT) || BM_TestHFlag(eve, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(eve, BM_ELEM_SELECT) || BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) continue; sco = CustomData_bmesh_get_n(&em->bm->vdata, eve->head.data, CD_SHAPEKEY, shape); @@ -2748,19 +2748,19 @@ static int select_axis_exec(bContext *C, wmOperator *op) value += limit; BM_ITER(ev, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(ev, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(ev, BM_ELEM_HIDDEN)) { switch(mode) { case -1: /* aligned */ if (fabs(ev->co[axis] - value) < limit) - BM_Select(em->bm, ev, TRUE); + BM_elem_select_set(em->bm, ev, TRUE); break; case 0: /* neg */ if (ev->co[axis] > value) - BM_Select(em->bm, ev, TRUE); + BM_elem_select_set(em->bm, ev, TRUE); break; case 1: /* pos */ if (ev->co[axis] < value) - BM_Select(em->bm, ev, TRUE); + BM_elem_select_set(em->bm, ev, TRUE); break; } } @@ -2821,13 +2821,13 @@ static int solidify_exec(bContext *C, wmOperator *op) /* deselect only the faces in the region to be solidified (leave wire edges and loose verts selected, as there will be no corresponding geometry selected below) */ - BMO_UnHeaderFlag_Buffer(bm, &bmop, "geom", BM_ELEM_SELECT, BM_FACE); + BMO_slot_buffer_hflag_clear(bm, &bmop, "geom", BM_ELEM_SELECT, BM_FACE); /* run the solidify operator */ - BMO_Exec_Op(bm, &bmop); + BMO_op_exec(bm, &bmop); /* select the newly generated faces */ - BMO_HeaderFlag_Buffer(bm, &bmop, "geomout", BM_ELEM_SELECT, BM_FACE); + BMO_slot_buffer_hflag(bm, &bmop, "geomout", BM_ELEM_SELECT, BM_FACE); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; @@ -3102,7 +3102,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op) /* the floating point coordinates of verts in screen space will be stored in a hash table according to the vertices pointer */ gh = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp, "knife cut exec"); - for (bv = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL); bv; bv = BMIter_Step(&iter)) { + for (bv = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); bv; bv = BM_iter_step(&iter)) { scr = MEM_mallocN(sizeof(float)*2, "Vertex Screen Coordinates"); copy_v3_v3(co, bv->co); co[3] = 1.0f; @@ -3116,41 +3116,41 @@ static int knife_cut_exec(bContext *C, wmOperator *op) } /* store percentage of edge cut for KNIFE_EXACT here.*/ - for (be = BMIter_New(&iter, bm, BM_EDGES_OF_MESH, NULL); be; be = BMIter_Step(&iter)) { - if (BM_Selected(bm, be)) { + for (be = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL); be; be = BM_iter_step(&iter)) { + if (BM_elem_select_test(bm, be)) { isect = bm_seg_intersect(be, curve, len, mode, gh, &isected); if (isect != 0.0f) { if (mode != KNIFE_MULTICUT && mode != KNIFE_MIDPOINT) { - BMO_Insert_MapFloat(bm, &bmop, + BMO_slot_map_float_insert(bm, &bmop, "edgepercents", be, isect); } - BMO_SetFlag(bm, be, 1); + BMO_elem_flag_set(bm, be, 1); } else { - BMO_ClearFlag(bm, be, 1); + BMO_elem_flag_clear(bm, be, 1); } } else { - BMO_ClearFlag(bm, be, 1); + BMO_elem_flag_clear(bm, be, 1); } } - BMO_Flag_To_Slot(bm, &bmop, "edges", 1, BM_EDGE); + BMO_slot_from_flag(bm, &bmop, "edges", 1, BM_EDGE); if (mode == KNIFE_MIDPOINT) numcuts = 1; - BMO_Set_Int(&bmop, "numcuts", numcuts); + BMO_slot_int_set(&bmop, "numcuts", numcuts); - BMO_Set_Int(&bmop, "flag", B_KNIFE); - BMO_Set_Int(&bmop, "quadcornertype", SUBD_STRAIGHT_CUT); - BMO_Set_Int(&bmop, "singleedge", 0); - BMO_Set_Int(&bmop, "gridfill", 0); + BMO_slot_int_set(&bmop, "flag", B_KNIFE); + BMO_slot_int_set(&bmop, "quadcornertype", SUBD_STRAIGHT_CUT); + BMO_slot_int_set(&bmop, "singleedge", 0); + BMO_slot_int_set(&bmop, "gridfill", 0); - BMO_Set_Float(&bmop, "radius", 0); + BMO_slot_float_set(&bmop, "radius", 0); - BMO_Exec_Op(bm, &bmop); + BMO_op_exec(bm, &bmop); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; } @@ -3203,7 +3203,7 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO if (!em) return OPERATOR_CANCELLED; - bmnew = BM_Make_Mesh(obedit, allocsize); + bmnew = BM_mesh_create(obedit, allocsize); CustomData_copy(&em->bm->vdata, &bmnew->vdata, CD_MASK_BMESH, CD_CALLOC, 0); CustomData_copy(&em->bm->edata, &bmnew->edata, CD_MASK_BMESH, CD_CALLOC, 0); CustomData_copy(&em->bm->ldata, &bmnew->ldata, CD_MASK_BMESH, CD_CALLOC, 0); @@ -3224,31 +3224,31 @@ static int mesh_separate_selected(Main *bmain, Scene *scene, Base *editbase, wmO /* clean up any loose edges */ BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) continue; - if (BM_Edge_FaceCount(e) != 0) { - BM_Select(em->bm, e, FALSE); + if (BM_edge_face_count(e) != 0) { + BM_elem_select_set(em->bm, e, FALSE); } } EDBM_CallOpf(em, wmop, "del geom=%hvef context=%i", BM_ELEM_SELECT, DEL_EDGES); /* clean up any loose verts */ BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; - if (BM_Vert_EdgeCount(v) != 0) { - BM_Select(em->bm, v, FALSE); + if (BM_vert_edge_count(v) != 0) { + BM_elem_select_set(em->bm, v, FALSE); } } EDBM_CallOpf(em, wmop, "del geom=%hvef context=%i", BM_ELEM_SELECT, DEL_VERTS); - BM_Compute_Normals(bmnew); - BMO_CallOpf(bmnew, "bmesh_to_mesh mesh=%p object=%p", basenew->object->data, basenew->object); + BM_mesh_normals_update(bmnew); + BMO_op_callf(bmnew, "bmesh_to_mesh mesh=%p object=%p", basenew->object->data, basenew->object); - BM_Free_Mesh(bmnew); + BM_mesh_free(bmnew); ((Mesh *)basenew->object->data)->edit_btmesh = NULL; return 1; @@ -3277,7 +3277,7 @@ static int mesh_separate_loose(Main *bmain, Scene *scene, Base *editbase, wmOper /* Clear all selected vertices */ BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) { - BM_Select(bm, v, FALSE); + BM_elem_select_set(bm, v, FALSE); } /* Flush the selection to clear edge/face selections to match @@ -3303,20 +3303,20 @@ static int mesh_separate_loose(Main *bmain, Scene *scene, Base *editbase, wmOper } /* Select the seed explicitly, in case it has no edges */ - BM_Select(bm, v_seed, TRUE); + BM_elem_select_set(bm, v_seed, TRUE); /* Walk from the single vertex, selecting everything connected * to it */ - BMW_Init(&walker, bm, BMW_SHELL, + BMW_init(&walker, bm, BMW_SHELL, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); - e = BMW_Begin(&walker, v_seed); - for (; e; e = BMW_Step(&walker)) { - BM_Select(bm, e->v1, TRUE); - BM_Select(bm, e->v2, TRUE); + e = BMW_begin(&walker, v_seed); + for (; e; e = BMW_step(&walker)) { + BM_elem_select_set(bm, e->v1, TRUE); + BM_elem_select_set(bm, e->v2, TRUE); } - BMW_End(&walker); + BMW_end(&walker); /* Flush the selection to get edge/face selections matching * the vertex selection */ @@ -3394,10 +3394,10 @@ static int fill_mesh_exec(bContext *C, wmOperator *op) if (!EDBM_InitOpf(em, &bmop, op, "triangle_fill edges=%he", BM_ELEM_SELECT)) return OPERATOR_CANCELLED; - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); /* select new geometry */ - BMO_HeaderFlag_Buffer(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_FACE|BM_EDGE); + BMO_slot_buffer_hflag(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_FACE|BM_EDGE); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; @@ -3570,9 +3570,9 @@ static int split_mesh_exec(bContext *C, wmOperator *op) BMOperator bmop; EDBM_InitOpf(em, &bmop, op, "split geom=%hvef", BM_ELEM_SELECT); - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); BM_clear_flag_all(em->bm, BM_ELEM_SELECT); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) { return OPERATOR_CANCELLED; } @@ -3632,9 +3632,9 @@ static int spin_mesh_exec(bContext *C, wmOperator *op) BM_ELEM_SELECT, cent, axis, d, steps, degr, dupli)) { return OPERATOR_CANCELLED; } - BMO_Exec_Op(bm, &spinop); + BMO_op_exec(bm, &spinop); EDBM_clear_flag_all(em, BM_ELEM_SELECT); - BMO_HeaderFlag_Buffer(bm, &spinop, "lastout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(bm, &spinop, "lastout", BM_ELEM_SELECT, BM_ALL); if (!EDBM_FinishOp(em, &spinop, op, TRUE)) { return OPERATOR_CANCELLED; } @@ -3712,15 +3712,15 @@ static int screw_mesh_exec(bContext *C, wmOperator *op) /* find two vertices with valence count == 1, more or less is wrong */ v1 = NULL; v2 = NULL; - for (eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL); - eve; eve = BMIter_Step(&iter)) { + for (eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL); + eve; eve = BM_iter_step(&iter)) { valence = 0; - for (eed = BMIter_New(&eiter, em->bm, BM_EDGES_OF_VERT, eve); - eed; eed = BMIter_Step(&eiter)) { + for (eed = BM_iter_new(&eiter, em->bm, BM_EDGES_OF_VERT, eve); + eed; eed = BM_iter_step(&eiter)) { - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { valence++; } @@ -3758,9 +3758,9 @@ static int screw_mesh_exec(bContext *C, wmOperator *op) { return OPERATOR_CANCELLED; } - BMO_Exec_Op(bm, &spinop); + BMO_op_exec(bm, &spinop); EDBM_clear_flag_all(em, BM_ELEM_SELECT); - BMO_HeaderFlag_Buffer(bm, &spinop, "lastout", BM_ELEM_SELECT, BM_ALL); + BMO_slot_buffer_hflag(bm, &spinop, "lastout", BM_ELEM_SELECT, BM_ALL); if (!EDBM_FinishOp(em, &spinop, op, TRUE)) { return OPERATOR_CANCELLED; } @@ -3817,8 +3817,8 @@ static int select_by_number_vertices_exec(bContext *C, wmOperator *op) int numverts = RNA_int_get(op->ptr, "number"); int type = RNA_enum_get(op->ptr, "type"); - for (efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); - efa; efa = BMIter_Step(&iter)) { + for (efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); + efa; efa = BM_iter_step(&iter)) { int select = 0; @@ -3831,7 +3831,7 @@ static int select_by_number_vertices_exec(bContext *C, wmOperator *op) } if (select) { - BM_Select(em->bm, efa, TRUE); + BM_elem_select_set(em->bm, efa, TRUE); } } @@ -3875,19 +3875,19 @@ static int select_loose_verts_exec(bContext *C, wmOperator *UNUSED(op)) BMEdge *eed; BMIter iter; - for (eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL); - eve; eve = BMIter_Step(&iter)) { + for (eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL); + eve; eve = BM_iter_step(&iter)) { if (!eve->e) { - BM_Select(em->bm, eve, TRUE); + BM_elem_select_set(em->bm, eve, TRUE); } } - for (eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - eed; eed = BMIter_Step(&iter)) { + for (eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + eed; eed = BM_iter_step(&iter)) { if (!eed->l) { - BM_Select(em->bm, eed, TRUE); + BM_elem_select_set(em->bm, eed, TRUE); } } @@ -4009,7 +4009,7 @@ static void xsortvert_flag(bContext *UNUSED(C), int UNUSED(flag)) amount = em->bm->totvert; sortblock = MEM_callocN(sizeof(xvertsort)*amount,"xsort"); BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) sortblock[i].v1 = eve; } @@ -4354,7 +4354,7 @@ static int mesh_noise_exec(bContext *C, wmOperator *op) float b2, vec[3]; float ofs = tex->turbul / 200.0; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT) && !BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && !BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { b2 = BLI_hnoise(tex->noisesize, eve->co[0], eve->co[1], eve->co[2]); if (tex->stype) ofs *= (b2 * b2); vec[0] = fac * (b2 - BLI_hnoise(tex->noisesize, eve->co[0] + ofs, eve->co[1], eve->co[2])); @@ -4367,7 +4367,7 @@ static int mesh_noise_exec(bContext *C, wmOperator *op) } else { BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT) && !BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && !BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { float tin, dum; externtex(ma->mtex[0], eve->co, &tin, &dum, &dum, &dum, &dum, 0); eve->co[2] += fac * tin; @@ -4415,7 +4415,7 @@ static int mesh_bevel_exec(bContext *C, wmOperator *op) float *w = NULL, ftot; int li; - BM_add_data_layer(em->bm, &em->bm->edata, CD_PROP_FLT); + BM_data_layer_add(em->bm, &em->bm->edata, CD_PROP_FLT); li = CustomData_number_of_layers(&em->bm->edata, CD_PROP_FLT)-1; BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { @@ -4456,12 +4456,12 @@ static int mesh_bevel_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - BMO_Exec_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); if (!EDBM_FinishOp(em, &bmop, op, TRUE)) return OPERATOR_CANCELLED; } - BM_free_data_layer_n(em->bm, &em->bm->edata, CD_MASK_PROP_FLT, li); + BM_data_layer_free_n(em->bm, &em->bm->edata, CD_MASK_PROP_FLT, li); MEM_freeN(w); diff --git a/source/blender/editors/mesh/bmeshutils.c b/source/blender/editors/mesh/bmeshutils.c index ec72b0ebd54..5fa455a13d1 100644 --- a/source/blender/editors/mesh/bmeshutils.c +++ b/source/blender/editors/mesh/bmeshutils.c @@ -49,13 +49,13 @@ void EDBM_RecalcNormals(BMEditMesh *em) { - BM_Compute_Normals(em->bm); + BM_mesh_normals_update(em->bm); } void EDBM_ClearMesh(BMEditMesh *em) { /* clear bmesh */ - BM_Clear_Mesh(em->bm); + BM_mesh_clear(em->bm); /* free derived meshes */ if (em->derivedCage) { @@ -93,9 +93,9 @@ void EDBM_stats_update(BMEditMesh *em) em->bm->totvertsel = em->bm->totedgesel = em->bm->totfacesel = 0; for (i = 0; i < 3; i++) { - ele = BMIter_New(&iter, em->bm, iter_types[i], NULL); - for ( ; ele; ele = BMIter_Step(&iter)) { - if (BM_TestHFlag(ele, BM_ELEM_SELECT)) { + ele = BM_iter_new(&iter, em->bm, iter_types[i], NULL); + for ( ; ele; ele = BM_iter_step(&iter)) { + if (BM_elem_flag_test(ele, BM_ELEM_SELECT)) { (*tots[i])++; } } @@ -109,7 +109,7 @@ int EDBM_InitOpf(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const char *f va_start(list, fmt); - if (!BMO_VInitOpf(bm, bmop, fmt, list)) { + if (!BMO_op_vinitf(bm, bmop, fmt, list)) { BKE_report(op->reports, RPT_ERROR, "Parse error in EDBM_CallOpf"); va_end(list); @@ -131,9 +131,9 @@ int EDBM_FinishOp(BMEditMesh *em, BMOperator *bmop, wmOperator *op, const int re { const char *errmsg; - BMO_Finish_Op(em->bm, bmop); + BMO_op_finish(em->bm, bmop); - if (BMO_GetError(em->bm, &errmsg, NULL)) { + if (BMO_error_get(em->bm, &errmsg, NULL)) { BMEditMesh *emcopy = em->emcopy; if (report) BKE_report(op->reports, RPT_ERROR, errmsg); @@ -171,7 +171,7 @@ int EDBM_CallOpf(BMEditMesh *em, wmOperator *op, const char *fmt, ...) va_start(list, fmt); - if (!BMO_VInitOpf(bm, &bmop, fmt, list)) { + if (!BMO_op_vinitf(bm, &bmop, fmt, list)) { BKE_report(op->reports, RPT_ERROR, "Parse error in EDBM_CallOpf"); va_end(list); @@ -182,7 +182,7 @@ int EDBM_CallOpf(BMEditMesh *em, wmOperator *op, const char *fmt, ...) em->emcopy = BMEdit_Copy(em); em->emcopyusers++; - BMO_Exec_Op(bm, &bmop); + BMO_op_exec(bm, &bmop); va_end(list); return EDBM_FinishOp(em, &bmop, op, TRUE); @@ -196,7 +196,7 @@ int EDBM_CallAndSelectOpf(BMEditMesh *em, wmOperator *op, const char *selectslot va_start(list, fmt); - if (!BMO_VInitOpf(bm, &bmop, fmt, list)) { + if (!BMO_op_vinitf(bm, &bmop, fmt, list)) { BKE_report(op->reports, RPT_ERROR, "Parse error in EDBM_CallOpf"); va_end(list); @@ -207,8 +207,8 @@ int EDBM_CallAndSelectOpf(BMEditMesh *em, wmOperator *op, const char *selectslot em->emcopy = BMEdit_Copy(em); em->emcopyusers++; - BMO_Exec_Op(bm, &bmop); - BMO_HeaderFlag_Buffer(em->bm, &bmop, selectslot, BM_ELEM_SELECT, BM_ALL); + BMO_op_exec(bm, &bmop); + BMO_slot_buffer_hflag(em->bm, &bmop, selectslot, BM_ELEM_SELECT, BM_ALL); va_end(list); return EDBM_FinishOp(em, &bmop, op, TRUE); @@ -222,7 +222,7 @@ int EDBM_CallOpfSilent(BMEditMesh *em, const char *fmt, ...) va_start(list, fmt); - if (!BMO_VInitOpf(bm, &bmop, fmt, list)) { + if (!BMO_op_vinitf(bm, &bmop, fmt, list)) { va_end(list); return 0; } @@ -231,7 +231,7 @@ int EDBM_CallOpfSilent(BMEditMesh *em, const char *fmt, ...) em->emcopy = BMEdit_Copy(em); em->emcopyusers++; - BMO_Exec_Op(bm, &bmop); + BMO_op_exec(bm, &bmop); va_end(list); return EDBM_FinishOp(em, &bmop, NULL, FALSE); @@ -291,7 +291,7 @@ void EDBM_LoadEditBMesh(Scene *scene, Object *ob) Mesh *me = ob->data; BMesh *bm = me->edit_btmesh->bm; - BMO_CallOpf(bm, "object_load_bmesh scene=%p object=%p", scene, ob); + BMO_op_callf(bm, "object_load_bmesh scene=%p object=%p", scene, ob); } void EDBM_FreeEditBMesh(BMEditMesh *tm) @@ -310,8 +310,8 @@ void EDBM_init_index_arrays(BMEditMesh *tm, int forvert, int foredge, int forfac tm->vert_index = MEM_mallocN(sizeof(void **) * tm->bm->totvert, "tm->vert_index"); - ele = BMIter_New(&iter, tm->bm, BM_VERTS_OF_MESH, NULL); - for ( ; ele; ele = BMIter_Step(&iter)) { + ele = BM_iter_new(&iter, tm->bm, BM_VERTS_OF_MESH, NULL); + for ( ; ele; ele = BM_iter_step(&iter)) { tm->vert_index[i++] = ele; } } @@ -323,8 +323,8 @@ void EDBM_init_index_arrays(BMEditMesh *tm, int forvert, int foredge, int forfac tm->edge_index = MEM_mallocN(sizeof(void **) * tm->bm->totedge, "tm->edge_index"); - ele = BMIter_New(&iter, tm->bm, BM_EDGES_OF_MESH, NULL); - for ( ; ele; ele = BMIter_Step(&iter)) { + ele = BM_iter_new(&iter, tm->bm, BM_EDGES_OF_MESH, NULL); + for ( ; ele; ele = BM_iter_step(&iter)) { tm->edge_index[i++] = ele; } } @@ -336,8 +336,8 @@ void EDBM_init_index_arrays(BMEditMesh *tm, int forvert, int foredge, int forfac tm->face_index = MEM_mallocN(sizeof(void **) * tm->bm->totface, "tm->face_index"); - ele = BMIter_New(&iter, tm->bm, BM_FACES_OF_MESH, NULL); - for ( ; ele; ele = BMIter_Step(&iter)) { + ele = BM_iter_new(&iter, tm->bm, BM_FACES_OF_MESH, NULL); + for ( ; ele; ele = BM_iter_step(&iter)) { tm->face_index[i++] = ele; } } @@ -379,7 +379,7 @@ BMFace *EDBM_get_face_for_index(BMEditMesh *tm, int index) void EDBM_selectmode_flush_ex(BMEditMesh *em, int selectmode) { em->bm->selectmode = selectmode; - BM_SelectMode_Flush(em->bm); + BM_mesh_select_mode_flush(em->bm); em->bm->selectmode = em->selectmode; } @@ -392,7 +392,7 @@ void EDBM_deselect_flush(BMEditMesh *em) { /* function below doesnt use. just do this to keep the values in sync */ em->bm->selectmode = em->selectmode; - BM_DeSelect_Flush(em->bm); + BM_mesh_deselect_flush(em->bm); } @@ -400,7 +400,7 @@ void EDBM_select_flush(BMEditMesh *em) { /* function below doesnt use. just do this to keep the values in sync */ em->bm->selectmode = em->selectmode; - BM_Select_Flush(em->bm); + BM_mesh_select_flush(em->bm); } void EDBM_select_more(BMEditMesh *em) @@ -408,12 +408,12 @@ void EDBM_select_more(BMEditMesh *em) BMOperator bmop; int usefaces = em->selectmode > SCE_SELECT_EDGE; - BMO_InitOpf(em->bm, &bmop, + BMO_op_initf(em->bm, &bmop, "regionextend geom=%hvef constrict=%d usefaces=%d", BM_ELEM_SELECT, 0, usefaces); - BMO_Exec_Op(em->bm, &bmop); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL); - BMO_Finish_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); + BMO_slot_buffer_hflag(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL); + BMO_op_finish(em->bm, &bmop); EDBM_selectmode_flush(em); } @@ -423,12 +423,12 @@ void EDBM_select_less(BMEditMesh *em) BMOperator bmop; int usefaces = em->selectmode > SCE_SELECT_EDGE; - BMO_InitOpf(em->bm, &bmop, + BMO_op_initf(em->bm, &bmop, "regionextend geom=%hvef constrict=%d usefaces=%d", BM_ELEM_SELECT, 0, usefaces); - BMO_Exec_Op(em->bm, &bmop); - BMO_HeaderFlag_Buffer(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL); - BMO_Finish_Op(em->bm, &bmop); + BMO_op_exec(em->bm, &bmop); + BMO_slot_buffer_hflag(em->bm, &bmop, "geomout", BM_ELEM_SELECT, BM_ALL); + BMO_op_finish(em->bm, &bmop); EDBM_selectmode_flush(em); } @@ -436,7 +436,7 @@ void EDBM_select_less(BMEditMesh *em) int EDBM_get_actSelection(BMEditMesh *em, BMEditSelection *ese) { BMEditSelection *ese_last = em->bm->selected.last; - BMFace *efa = BM_get_actFace(em->bm, FALSE); + BMFace *efa = BM_active_face_get(em->bm, FALSE); ese->next = ese->prev = NULL; @@ -476,12 +476,12 @@ void EDBM_clear_flag_all(BMEditMesh *em, const char hflag) int i; if (hflag & BM_ELEM_SELECT) - BM_clear_selection_history(em->bm); + BM_select_history_clear(em->bm); for (i = 0; i < 3; i++) { BM_ITER(ele, &iter, em->bm, iter_types[i], NULL) { - if (hflag & BM_ELEM_SELECT) BM_Select(em->bm, ele, FALSE); - BM_ClearHFlag(ele, hflag); + if (hflag & BM_ELEM_SELECT) BM_elem_select_set(em->bm, ele, FALSE); + BM_elem_flag_clear(ele, hflag); } } } @@ -496,13 +496,13 @@ void EDBM_set_flag_all(BMEditMesh *em, const char hflag) int i; for (i = 0; i < 3; i++) { - ele = BMIter_New(&iter, em->bm, iter_types[i], NULL); - for ( ; ele; ele = BMIter_Step(&iter)) { + ele = BM_iter_new(&iter, em->bm, iter_types[i], NULL); + for ( ; ele; ele = BM_iter_step(&iter)) { if (hflag & BM_ELEM_SELECT) { - BM_Select(em->bm, ele, TRUE); + BM_elem_select_set(em->bm, ele, TRUE); } else { - BM_SetHFlag(ele, hflag); + BM_elem_flag_set(ele, hflag); } } } @@ -548,7 +548,7 @@ static void *editbtMesh_to_undoMesh(void *emv, void *obdata) #endif - BMO_CallOpf(em->bm, "bmesh_to_mesh mesh=%p notesselation=%i", &um->me, 1); + BMO_op_callf(em->bm, "bmesh_to_mesh mesh=%p notesselation=%i", &um->me, 1); um->selectmode = em->selectmode; return um; @@ -567,8 +567,8 @@ static void undoMesh_to_editbtMesh(void *umv, void *emv, void *UNUSED(obdata)) BMEdit_Free(em); - bm = BM_Make_Mesh(ob, allocsize); - BMO_CallOpf(bm, "mesh_to_bmesh mesh=%p object=%p set_shapekey=%i", &um->me, ob, 0); + bm = BM_mesh_create(ob, allocsize); + BMO_op_callf(bm, "mesh_to_bmesh mesh=%p object=%p set_shapekey=%i", &um->me, ob, 0); em2 = BMEdit_Create(bm, TRUE); *em = *em2; @@ -614,14 +614,14 @@ UvVertMap *EDBM_make_uv_vert_map(BMEditMesh *em, int selected, int do_face_idx_a if (do_face_idx_array) EDBM_init_index_arrays(em, 0, 0, 1); - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); totverts = em->bm->totvert; totuv = 0; /* generate UvMapVert array */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!selected || ((!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) && BM_TestHFlag(efa, BM_ELEM_SELECT))) + if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) totuv += efa->len; } @@ -649,15 +649,15 @@ UvVertMap *EDBM_make_uv_vert_map(BMEditMesh *em, int selected, int do_face_idx_a a = 0; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!selected || ((!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) && BM_TestHFlag(efa, BM_ELEM_SELECT))) { + if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) { i = 0; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { buf->tfindex = i; buf->f = a; buf->separate = 0; - buf->next = vmap->vert[BM_GetIndex(l->v)]; - vmap->vert[BM_GetIndex(l->v)] = buf; + buf->next = vmap->vert[BM_elem_index_get(l->v)]; + vmap->vert[BM_elem_index_get(l->v)] = buf; buf++; i++; @@ -683,7 +683,7 @@ UvVertMap *EDBM_make_uv_vert_map(BMEditMesh *em, int selected, int do_face_idx_a efa = EDBM_get_face_for_index(em, v->f); /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, v->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa, v->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); uv = luv->uv; @@ -695,7 +695,7 @@ UvVertMap *EDBM_make_uv_vert_map(BMEditMesh *em, int selected, int do_face_idx_a efa = EDBM_get_face_for_index(em, iterv->f); /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); uv2 = luv->uv; @@ -754,14 +754,14 @@ UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_isla BMFace **stack; int stacksize = 0; - BM_ElemIndex_Ensure(em->bm, BM_VERT | BM_FACE); + BM_mesh_elem_index_ensure(em->bm, BM_VERT | BM_FACE); totverts = em->bm->totvert; totuv = 0; /* generate UvElement array */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!selected || ((!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) && BM_TestHFlag(efa, BM_ELEM_SELECT))) + if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) totuv += efa->len; } @@ -782,7 +782,7 @@ UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_isla } BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!selected || ((!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) && BM_TestHFlag(efa, BM_ELEM_SELECT))) { + if (!selected || ((!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) && BM_elem_flag_test(efa, BM_ELEM_SELECT))) { i = 0; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { buf->tfindex = i; @@ -790,8 +790,8 @@ UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_isla buf->separate = 0; buf->island = INVALID_ISLAND; - buf->next = element_map->vert[BM_GetIndex(l->v)]; - element_map->vert[BM_GetIndex(l->v)] = buf; + buf->next = element_map->vert[BM_elem_index_get(l->v)]; + element_map->vert[BM_elem_index_get(l->v)] = buf; buf++; i++; @@ -815,7 +815,7 @@ UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_isla efa = v->face; /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, v->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa, v->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); uv = luv->uv; @@ -827,7 +827,7 @@ UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_isla efa = iterv->face; /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); uv2 = luv->uv; @@ -866,14 +866,14 @@ UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_isla if (element_map->buf[i].island == INVALID_ISLAND) { element_map->buf[i].island = nislands; stack[0] = element_map->buf[i].face; - island_number[BM_GetIndex(stack[0])] = nislands; + island_number[BM_elem_index_get(stack[0])] = nislands; stacksize = 1; while (stacksize > 0) { efa = stack[--stacksize]; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - UvElement *element, *initelement = element_map->vert[BM_GetIndex(l->v)]; + UvElement *element, *initelement = element_map->vert[BM_elem_index_get(l->v)]; for (element = initelement; element; element = element->next) { if (element->separate) @@ -893,9 +893,9 @@ UvElementMap *EDBM_make_uv_element_map(BMEditMesh *em, int selected, int do_isla if (element->separate && element != initelement) break; - if (island_number[BM_GetIndex(element->face)] == INVALID_ISLAND) { + if (island_number[BM_elem_index_get(element->face)] == INVALID_ISLAND) { stack[stacksize++] = element->face; - island_number[BM_GetIndex(element->face)] = nislands; + island_number[BM_elem_index_get(element->face)] = nislands; } } break; @@ -984,7 +984,7 @@ MTexPoly *EDBM_get_active_mtexpoly(BMEditMesh *em, BMFace **act_efa, int sloppy) if (!EDBM_texFaceCheck(em)) return NULL; - efa = BM_get_actFace(em->bm, sloppy); + efa = BM_active_face_get(em->bm, sloppy); if (efa) { if (act_efa) *act_efa = efa; @@ -1041,14 +1041,14 @@ void EDBM_CacheMirrorVerts(BMEditMesh *em, const short use_select) } if (!CustomData_get_layer_named(&bm->vdata, CD_PROP_INT, BM_CD_LAYER_ID)) { - BM_add_data_layer_named(bm, &bm->vdata, CD_PROP_INT, BM_CD_LAYER_ID); + BM_data_layer_add_named(bm, &bm->vdata, CD_PROP_INT, BM_CD_LAYER_ID); } li = CustomData_get_named_layer_index(&bm->vdata, CD_PROP_INT, BM_CD_LAYER_ID); bm->vdata.layers[li].flag |= CD_FLAG_TEMPORARY; - BM_ElemIndex_Ensure(bm, BM_VERT); + BM_mesh_elem_index_ensure(bm, BM_VERT); if (topo) { ED_mesh_mirrtopo_init(me, -1, &mesh_topo_store, TRUE); @@ -1060,7 +1060,7 @@ void EDBM_CacheMirrorVerts(BMEditMesh *em, const short use_select) BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) { /* temporary for testing, check for selection */ - if (use_select && !BM_TestHFlag(v, BM_ELEM_SELECT)) { + if (use_select && !BM_elem_flag_test(v, BM_ELEM_SELECT)) { /* do nothing */ } else { @@ -1068,7 +1068,7 @@ void EDBM_CacheMirrorVerts(BMEditMesh *em, const short use_select) int *idx = CustomData_bmesh_get_layer_n(&bm->vdata, v->head.data, li); if (topo) { - mirr = cache_mirr_intptr_as_bmvert(mesh_topo_store.index_lookup, BM_GetIndex(v)); + mirr = cache_mirr_intptr_as_bmvert(mesh_topo_store.index_lookup, BM_elem_index_get(v)); } else { float co[3] = {-v->co[0], v->co[1], v->co[2]}; @@ -1076,9 +1076,9 @@ void EDBM_CacheMirrorVerts(BMEditMesh *em, const short use_select) } if (mirr && mirr != v) { - *idx = BM_GetIndex(mirr); + *idx = BM_elem_index_get(mirr); idx = CustomData_bmesh_get_layer_n(&bm->vdata, mirr->head.data, li); - *idx = BM_GetIndex(v); + *idx = BM_elem_index_get(v); } else { *idx = -1; @@ -1146,10 +1146,10 @@ void EDBM_ApplyMirrorCache(BMEditMesh *em, const int sel_from, const int sel_to) BLI_assert(em->vert_index != NULL); BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT) == sel_from) { + if (BM_elem_flag_test(v, BM_ELEM_SELECT) == sel_from) { BMVert *mirr = EDBM_GetMirrorVert(em, v); if (mirr) { - if (BM_TestHFlag(mirr, BM_ELEM_SELECT) == sel_to) { + if (BM_elem_flag_test(mirr, BM_ELEM_SELECT) == sel_to) { copy_v3_v3(mirr->co, v->co); mirr->co[0] *= -1.0f; } diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editbmesh_bvh.c index 7c7b1eb52e0..cc1f89e2c8b 100644 --- a/source/blender/editors/mesh/editbmesh_bvh.c +++ b/source/blender/editors/mesh/editbmesh_bvh.c @@ -108,7 +108,7 @@ BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, Scene *scene, Object *obedit) tree->cos = MEM_callocN(sizeof(float)*3*em->bm->totvert, "bmbvh cos"); BM_ITER_INDEX(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL, i) { - BM_SetIndex(v, i); /* set_inline */ + BM_elem_index_set(v, i); /* set_inline */ copy_v3_v3(tree->cos[i], v->co); } em->bm->elem_index_dirty &= ~BM_VERT; @@ -128,9 +128,9 @@ BMBVHTree *BMBVH_NewBVH(BMEditMesh *em, int flag, Scene *scene, Object *obedit) for (i=0; i<em->tottri; i++) { if (flag & BMBVH_USE_CAGE) { - copy_v3_v3(cos[0], cagecos[BM_GetIndex(em->looptris[i][0]->v)]); - copy_v3_v3(cos[1], cagecos[BM_GetIndex(em->looptris[i][1]->v)]); - copy_v3_v3(cos[2], cagecos[BM_GetIndex(em->looptris[i][2]->v)]); + copy_v3_v3(cos[0], cagecos[BM_elem_index_get(em->looptris[i][0]->v)]); + copy_v3_v3(cos[1], cagecos[BM_elem_index_get(em->looptris[i][1]->v)]); + copy_v3_v3(cos[2], cagecos[BM_elem_index_get(em->looptris[i][2]->v)]); } else { copy_v3_v3(cos[0], em->looptris[i][0]->v->co); copy_v3_v3(cos[1], em->looptris[i][1]->v->co); @@ -339,7 +339,7 @@ static BMFace *edge_ray_cast(BMBVHTree *tree, float *co, float *dir, float *hito { BMFace *f = BMBVH_RayCast(tree, co, dir, hitout, NULL); - if (f && BM_Edge_In_Face(f, e)) + if (f && BM_edge_in_face(f, e)) return NULL; return f; diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 4709a4ba831..bec1403a8dd 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -803,7 +803,7 @@ void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_to mesh_topo_store->prev_ob_mode = ob_mode; if(em) { - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); totvert = em->bm->totvert; } @@ -818,8 +818,8 @@ void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_to totedge = me->edit_btmesh->bm->totedge; BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - topo_hash[BM_GetIndex(eed->v1)]++; - topo_hash[BM_GetIndex(eed->v2)]++; + topo_hash[BM_elem_index_get(eed->v1)]++; + topo_hash[BM_elem_index_get(eed->v2)]++; } } else { @@ -839,8 +839,8 @@ void ED_mesh_mirrtopo_init(Mesh *me, const int ob_mode, MirrTopoStore_t *mesh_to if(em) { BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - topo_hash[BM_GetIndex(eed->v1)] += topo_hash_prev[BM_GetIndex(eed->v2)]; - topo_hash[BM_GetIndex(eed->v2)] += topo_hash_prev[BM_GetIndex(eed->v1)]; + topo_hash[BM_elem_index_get(eed->v1)] += topo_hash_prev[BM_elem_index_get(eed->v2)]; + topo_hash[BM_elem_index_get(eed->v2)] += topo_hash_prev[BM_elem_index_get(eed->v1)]; } } else { diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index b5d938c12e1..c72c61d14f3 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -220,7 +220,7 @@ static KnifeVert *get_bm_knife_vert(knifetool_opdata *kcd, BMVert *v) KnifeVert *kfv = BLI_ghash_lookup(kcd->origvertmap, v); if (!kfv) { - kfv = new_knife_vert(kcd, v->co, kcd->cagecos[BM_GetIndex(v)]); + kfv = new_knife_vert(kcd, v->co, kcd->cagecos[BM_elem_index_get(v)]); kfv->v = v; BLI_ghash_insert(kcd->origvertmap, v, kfv); } @@ -281,7 +281,7 @@ static void knife_start_cut(knifetool_opdata *kcd) knife_input_ray_cast(kcd, kcd->vc.mval, origin, ray); add_v3_v3v3(co, origin, ray); - v0 = BM_Vert_AtIndex(kcd->em->bm, 0); + v0 = BM_vert_at_index(kcd->em->bm, 0); if (v0) { closest_to_line_v3(kcd->prevcage, v0->co, co, origin); copy_v3_v3(kcd->prevco, kcd->prevcage); @@ -1651,12 +1651,12 @@ static void remerge_faces(knifetool_opdata *kcd) BMOperator bmop; int idx; - BMO_InitOpf(bm, &bmop, "beautify_fill faces=%ff constrain_edges=%fe", FACE_NEW, BOUNDARY); + BMO_op_initf(bm, &bmop, "beautify_fill faces=%ff constrain_edges=%fe", FACE_NEW, BOUNDARY); - BMO_Exec_Op(bm, &bmop); - BMO_Flag_Buffer(bm, &bmop, "geomout", FACE_NEW, BM_FACE); + BMO_op_exec(bm, &bmop); + BMO_slot_buffer_flag(bm, &bmop, "geomout", FACE_NEW, BM_FACE); - BMO_Finish_Op(bm, &bmop); + BMO_op_finish(bm, &bmop); BLI_smallhash_init(visit); BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { @@ -1664,7 +1664,7 @@ static void remerge_faces(knifetool_opdata *kcd) BMEdge *e; BMFace *f2; - if (!BMO_TestFlag(bm, f, FACE_NEW)) + if (!BMO_elem_flag_test(bm, f, FACE_NEW)) continue; if (BLI_smallhash_haskey(visit, (intptr_t)f)) @@ -1684,11 +1684,11 @@ static void remerge_faces(knifetool_opdata *kcd) BMIter fiter; BMFace *f3; - if (BMO_TestFlag(bm, e, BOUNDARY)) + if (BMO_elem_flag_test(bm, e, BOUNDARY)) continue; BM_ITER(f3, &fiter, bm, BM_FACES_OF_EDGE, e) { - if (!BMO_TestFlag(bm, f3, FACE_NEW)) + if (!BMO_elem_flag_test(bm, f3, FACE_NEW)) continue; if (BLI_smallhash_haskey(visit, (intptr_t)f3)) continue; @@ -1700,12 +1700,12 @@ static void remerge_faces(knifetool_opdata *kcd) } while (BLI_array_count(stack) > 0); if (BLI_array_count(faces) > 0) { - idx = BM_GetIndex(faces[0]); + idx = BM_elem_index_get(faces[0]); - f2 = BM_Join_Faces(bm, faces, BLI_array_count(faces)); + f2 = BM_faces_join(bm, faces, BLI_array_count(faces)); if (f2) { - BMO_SetFlag(bm, f2, FACE_NEW); - BM_SetIndex(f2, idx); /* set_dirty! */ /* BMESH_TODO, check if this is valid or not */ + BMO_elem_flag_set(bm, f2, FACE_NEW); + BM_elem_index_set(f2, idx); /* set_dirty! */ /* BMESH_TODO, check if this is valid or not */ } } } @@ -1741,14 +1741,14 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) /* BMESH_TODO this should be valid now, leaving here until we can ensure this - campbell */ i = 0; BM_ITER(f, &bmiter, bm, BM_FACES_OF_MESH, NULL) { - BM_SetIndex(f, i); /* set_inline */ + BM_elem_index_set(f, i); /* set_inline */ faces[i] = f; i++; } bm->elem_index_dirty &= ~BM_FACE; BM_ITER(e, &bmiter, bm, BM_EDGES_OF_MESH, NULL) { - BMO_SetFlag(bm, e, BOUNDARY); + BMO_elem_flag_set(bm, e, BOUNDARY); } /* turn knife verts into real verts, as necassary */ @@ -1756,16 +1756,16 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) for (kfv = BLI_mempool_iterstep(&iter); kfv; kfv = BLI_mempool_iterstep(&iter)) { if (!kfv->v) { /* shouldn't we be at least copying the normal? - if not some comment here should explain why - campbell */ - kfv->v = BM_Make_Vert(bm, kfv->co, NULL); + kfv->v = BM_vert_create(bm, kfv->co, NULL); kfv->flag = 1; - BMO_SetFlag(bm, kfv->v, DEL); + BMO_elem_flag_set(bm, kfv->v, DEL); } else { kfv->flag = 0; - BMO_SetFlag(bm, kfv->v, VERT_ORIG); + BMO_elem_flag_set(bm, kfv->v, VERT_ORIG); } - BMO_SetFlag(bm, kfv->v, MARK); + BMO_elem_flag_set(bm, kfv->v, MARK); } /* we want to only do changed faces. first, go over new edges and add to @@ -1789,20 +1789,20 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) if (kfe->e) { kfe->oe = kfe->e; - BMO_SetFlag(bm, kfe->e, DEL); - BMO_ClearFlag(bm, kfe->e, BOUNDARY); + BMO_elem_flag_set(bm, kfe->e, DEL); + BMO_elem_flag_clear(bm, kfe->e, BOUNDARY); kfe->e = NULL; } - kfe->e = BM_Make_Edge(bm, kfe->v1->v, kfe->v2->v, NULL, TRUE); - BMO_SetFlag(bm, kfe->e, BOUNDARY); + kfe->e = BM_edge_create(bm, kfe->v1->v, kfe->v2->v, NULL, TRUE); + BMO_elem_flag_set(bm, kfe->e, BOUNDARY); for (ref = kfe->faces.first; ref; ref = ref->next) { f = ref->ref; entry = BLI_memarena_alloc(arena, sizeof(*entry)); entry->kfe = kfe; - BLI_addtail(face_nets + BM_GetIndex(f), entry); + BLI_addtail(face_nets + BM_elem_index_get(f), entry); } } @@ -1818,16 +1818,16 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) k++; - BMO_SetFlag(bm, kfe->e, BOUNDARY); + BMO_elem_flag_set(bm, kfe->e, BOUNDARY); kfe->oe = kfe->e; for (ref = kfe->faces.first; ref; ref = ref->next) { f = ref->ref; - if (face_nets[BM_GetIndex(f)].first) { + if (face_nets[BM_elem_index_get(f)].first) { entry = BLI_memarena_alloc(arena, sizeof(*entry)); entry->kfe = kfe; - BLI_addtail(face_nets + BM_GetIndex(f), entry); + BLI_addtail(face_nets + BM_elem_index_get(f), entry); } } } @@ -1842,7 +1842,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) BLI_smallhash_init(hash); if (face_nets[i].first) - BMO_SetFlag(bm, f, DEL); + BMO_elem_flag_set(bm, f, DEL); BLI_begin_edgefill(); @@ -1882,8 +1882,8 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) if (entry->kfe->oe) eed->f = FILLBOUNDARY; /* mark as original boundary edge */ - BMO_ClearFlag(bm, entry->kfe->e->v1, DEL); - BMO_ClearFlag(bm, entry->kfe->e->v2, DEL); + BMO_elem_flag_clear(bm, entry->kfe->e->v1, DEL); + BMO_elem_flag_clear(bm, entry->kfe->e->v2, DEL); } else { if (lasteve->xs < 2) @@ -1903,27 +1903,27 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) if (v1 == v2 || v2 == v3 || v1 == v3) continue; - if (BM_Face_Exists(bm, verts, 3, &f2)) + if (BM_face_exists(bm, verts, 3, &f2)) continue; - f2 = BM_Make_Face_QuadTri(bm, + f2 = BM_face_create_quad_tri(bm, v1, v2, v3, NULL, NULL, FALSE); - BMO_SetFlag(bm, f2, FACE_NEW); + BMO_elem_flag_set(bm, f2, FACE_NEW); l = BM_FACE_FIRST_LOOP(f2); do { - BMO_ClearFlag(bm, l->e, DEL); + BMO_elem_flag_clear(bm, l->e, DEL); l = l->next; } while (l != BM_FACE_FIRST_LOOP(f2)); - BMO_ClearFlag(bm, f2, DEL); - BM_SetIndex(f2, i); /* set_dirty! */ /* note, not 100% sure this is dirty? need to check */ + BMO_elem_flag_clear(bm, f2, DEL); + BM_elem_index_set(f2, i); /* set_dirty! */ /* note, not 100% sure this is dirty? need to check */ - BM_Face_UpdateNormal(bm, f2); + BM_face_normal_update(bm, f2); if (dot_v3v3(f->no, f2->no) < 0.0f) { - BM_flip_normal(bm, f2); + BM_face_normal_flip(bm, f2); } } @@ -1938,15 +1938,15 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) BMFace *f2; BMIter liter1; - if (!BMO_TestFlag(bm, f, FACE_NEW)) + if (!BMO_elem_flag_test(bm, f, FACE_NEW)) continue; - f2 = faces[BM_GetIndex(f)]; - if (BM_GetIndex(f) < 0 || BM_GetIndex(f) >= totface) { + f2 = faces[BM_elem_index_get(f)]; + if (BM_elem_index_get(f) < 0 || BM_elem_index_get(f) >= totface) { fprintf(stderr, "%s: face index out of range! (bmesh internal error)\n", __func__); } - BM_Copy_Attributes(bm, bm, f2, f); + BM_elem_copy_attrs(bm, bm, f2, f); BM_ITER(l1, &liter1, bm, BM_LOOPS_OF_FACE, f) { BM_loop_interp_from_face(bm, l1, f2, TRUE, TRUE); @@ -1957,9 +1957,9 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) remerge_faces(kcd); /* delete left over faces */ - BMO_CallOpf(bm, "del geom=%ff context=%i", DEL, DEL_ONLYFACES); - BMO_CallOpf(bm, "del geom=%fe context=%i", DEL, DEL_EDGES); - BMO_CallOpf(bm, "del geom=%fv context=%i", DEL, DEL_VERTS); + BMO_op_callf(bm, "del geom=%ff context=%i", DEL, DEL_ONLYFACES); + BMO_op_callf(bm, "del geom=%fe context=%i", DEL, DEL_EDGES); + BMO_op_callf(bm, "del geom=%fv context=%i", DEL, DEL_VERTS); if (face_nets) MEM_freeN(face_nets); @@ -1968,7 +1968,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) BLI_memarena_free(arena); BLI_smallhash_release(hash); - BMO_ClearStack(bm); /* remerge_faces sometimes raises errors, so make sure to clear them */ + BMO_error_clear(bm); /* remerge_faces sometimes raises errors, so make sure to clear them */ bmesh_end_edit(bm, BMOP_UNTAN_MULTIRES); BMO_pop(bm); @@ -2084,7 +2084,7 @@ static int knifetool_init(bContext *C, wmOperator *op, int UNUSED(do_cut)) kcd->em = ((Mesh *)kcd->ob->data)->edit_btmesh; - BM_ElemIndex_Ensure(kcd->em->bm, BM_VERT); + BM_mesh_elem_index_ensure(kcd->em->bm, BM_VERT); cage = editbmesh_get_derived_cage_and_final(scene, obedit, kcd->em, &final, CD_MASK_DERIVEDMESH); kcd->cagecos = MEM_callocN(sizeof(float) * 3 * kcd->em->bm->totvert, "knife cagecos"); diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index ee99443e8ef..5667b4b13b6 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -145,9 +145,9 @@ static void edgering_find_order(BMEditMesh *em, BMEdge *lasteed, BMEdge *eed, l = eed->l; /*find correct order for v[1]*/ - if (!(BM_Edge_In_Face(l->f, eed) && BM_Edge_In_Face(l->f, lasteed))) { + if (!(BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed))) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_LOOP, l) { - if (BM_Edge_In_Face(l->f, eed) && BM_Edge_In_Face(l->f, lasteed)) + if (BM_edge_in_face(l->f, eed) && BM_edge_in_face(l->f, lasteed)) break; } } @@ -161,7 +161,7 @@ static void edgering_find_order(BMEditMesh *em, BMEdge *lasteed, BMEdge *eed, return; } - l2 = BM_OtherFaceLoop(l->e, l->f, eed->v1); + l2 = BM_face_other_loop(l->e, l->f, eed->v1); rev = (l2 == l->prev); while (l2->v != lasteed->v1 && l2->v != lasteed->v2) { l2 = rev ? l2->prev : l2->next; @@ -204,26 +204,26 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) } if (select) { - BMW_Init(&walker, em->bm, BMW_EDGERING, + BMW_init(&walker, em->bm, BMW_EDGERING, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); - eed = BMW_Begin(&walker, startedge); - for (; eed; eed=BMW_Step(&walker)) { - BM_Select(em->bm, eed, TRUE); + eed = BMW_begin(&walker, startedge); + for (; eed; eed=BMW_step(&walker)) { + BM_elem_select_set(em->bm, eed, TRUE); } - BMW_End(&walker); + BMW_end(&walker); return; } - BMW_Init(&walker, em->bm, BMW_EDGERING, + BMW_init(&walker, em->bm, BMW_EDGERING, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, BMW_NIL_LAY); - eed = startedge = BMW_Begin(&walker, startedge); + eed = startedge = BMW_begin(&walker, startedge); lastv1 = NULL; - for (lasteed=NULL; eed; eed=BMW_Step(&walker)) { + for (lasteed=NULL; eed; eed=BMW_step(&walker)) { if (lasteed) { if (lastv1) { v[1][0] = v[0][0]; @@ -255,7 +255,7 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) lasteed = eed; } - if (lasteed != startedge && BM_Edge_Share_Faces(lasteed, startedge)) { + if (lasteed != startedge && BM_edge_share_faces(lasteed, startedge)) { v[1][0] = v[0][0]; v[1][1] = v[0][1]; @@ -280,7 +280,7 @@ static void edgering_sel(tringselOpData *lcd, int previewlines, int select) } } - BMW_End(&walker); + BMW_end(&walker); lcd->edges = edges; lcd->totedge = tot; } diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 9ed177f0f7d..e818f8aad93 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -109,7 +109,7 @@ static void delete_customdata_layer(bContext *C, Object *ob, CustomDataLayer *la CustomData_set_layer_active(data, type, layer - &data->layers[index]); if(me->edit_btmesh) { - BM_free_data_layer(me->edit_btmesh->bm, data, type); + BM_data_layer_free(me->edit_btmesh->bm, data, type); } else { CustomData_free_layer_active(data, type, tot); @@ -215,7 +215,7 @@ int ED_mesh_uv_loop_reset(struct bContext *C, struct Mesh *me) BLI_assert(CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV)); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; i = 0; @@ -312,7 +312,7 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s if (layernum >= MAX_MTFACE) return -1; - BM_add_data_layer(em->bm, &em->bm->pdata, CD_MTEXPOLY); + BM_data_layer_add(em->bm, &em->bm->pdata, CD_MTEXPOLY); CustomData_set_layer_active(&em->bm->pdata, CD_MTEXPOLY, layernum); CustomData_set_layer_name(&em->bm->pdata, CD_MTEXPOLY, layernum, name); @@ -324,7 +324,7 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s CustomData_set_layer_active(&em->bm->pdata, CD_MTEXPOLY, layernum); } - BM_add_data_layer(em->bm, &em->bm->ldata, CD_MLOOPUV); + BM_data_layer_add(em->bm, &em->bm->ldata, CD_MLOOPUV); CustomData_set_layer_name(&em->bm->ldata, CD_MLOOPUV, layernum, name); CustomData_set_layer_active(&em->bm->ldata, CD_MLOOPUV, layernum); @@ -402,7 +402,7 @@ int ED_mesh_color_add(bContext *C, Scene *UNUSED(scene), Object *UNUSED(ob), Mes return -1; } - BM_add_data_layer(em->bm, &em->bm->pdata, CD_MLOOPCOL); + BM_data_layer_add(em->bm, &em->bm->pdata, CD_MLOOPCOL); CustomData_set_layer_active(&em->bm->ldata, CD_MLOOPCOL, layernum); /* copy data from active vertex color layer */ diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index bb3d6a88c5d..9593e54acd7 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -339,7 +339,7 @@ static Object* createRepresentation(bContext *C, struct recast_polyMesh *pmesh, co[1]= bmin[1] + v[1]*ch; co[2]= bmin[2] + v[2]*cs; SWAP(float, co[1], co[2]); - BM_Make_Vert(em->bm, co, NULL); + BM_vert_create(em->bm, co, NULL); } /* create custom data layer to save polygon idx */ @@ -369,7 +369,7 @@ static Object* createRepresentation(bContext *C, struct recast_polyMesh *pmesh, for(j= nv; j<ndv; j++) { copy_v3_v3(co, &dverts[3*(vbase + j)]); SWAP(float, co[1], co[2]); - BM_Make_Vert(em->bm, co, NULL); + BM_vert_create(em->bm, co, NULL); } EDBM_init_index_arrays(em, 1, 0, 0); @@ -386,7 +386,7 @@ static Object* createRepresentation(bContext *C, struct recast_polyMesh *pmesh, else face[k] = uniquevbase+tri[k]-nv; /* unique vertex */ } - newFace= BM_Make_Face_QuadTri(em->bm, + newFace= BM_face_create_quad_tri(em->bm, EDBM_get_vert_for_index(em, face[0]), EDBM_get_vert_for_index(em, face[2]), EDBM_get_vert_for_index(em, face[1]), NULL, @@ -487,7 +487,7 @@ static int navmesh_face_copy_exec(bContext *C, wmOperator *op) BMEditMesh *em= ((Mesh *)obedit->data)->edit_btmesh; /* do work here */ - BMFace *efa_act= BM_get_actFace(em->bm, FALSE); + BMFace *efa_act= BM_active_face_get(em->bm, FALSE); if(efa_act) { if(CustomData_has_layer(&em->bm->pdata, CD_RECAST)) { @@ -499,7 +499,7 @@ static int navmesh_face_copy_exec(bContext *C, wmOperator *op) if(targetPolyIdx > 0) { /* set target poly idx to other selected faces */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_TestHFlag(efa, BM_ELEM_SELECT) && efa != efa_act) { + if(BM_elem_flag_test(efa, BM_ELEM_SELECT) && efa != efa_act) { int* recastDataBlock= (int*)CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_RECAST); *recastDataBlock= targetPolyIdx; } @@ -584,7 +584,7 @@ static int navmesh_face_add_exec(bContext *C, wmOperator *UNUSED(op)) /*XXX this originally went last to first, but that isn't possible anymore*/ BM_ITER(ef, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_TestHFlag(ef, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(ef, BM_ELEM_SELECT)) { int *recastDataBlock= (int*)CustomData_bmesh_get(&em->bm->pdata, ef->head.data, CD_RECAST); *recastDataBlock= targetPolyIdx; } diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index bf018a75995..2083c51efa9 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -79,7 +79,7 @@ static int return_editmesh_indexar(BMEditMesh *em, int *tot, int **indexar, floa int *index, nr, totvert=0; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT)) totvert++; + if(BM_elem_flag_test(eve, BM_ELEM_SELECT)) totvert++; } if(totvert==0) return 0; @@ -89,7 +89,7 @@ static int return_editmesh_indexar(BMEditMesh *em, int *tot, int **indexar, floa zero_v3(cent); BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eve, BM_ELEM_SELECT)) { *index= nr; index++; add_v3_v3(cent, eve->co); } @@ -148,7 +148,7 @@ static void select_editbmesh_hook(Object *ob, HookModifierData *hmd) BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { if(nr==hmd->indexar[index]) { - BM_Select(em->bm, eve, TRUE); + BM_elem_select_set(em->bm, eve, TRUE); if(index < hmd->totindex-1) index++; } diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index aef8aa42931..e8a09732313 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -220,7 +220,7 @@ static int object_modifier_remove(Object *ob, ModifierData *md, int *sort_depsgr /* CustomData_external_remove is used here only to mark layer as non-external for further free-ing, so zero element count looks safer than em->totface */ CustomData_external_remove(&em->bm->ldata, &me->id, CD_MDISPS, 0); - BM_free_data_layer(em->bm, &em->bm->ldata, CD_MDISPS); + BM_data_layer_free(em->bm, &em->bm->ldata, CD_MDISPS); } else { CustomData_external_remove(&me->ldata, &me->id, CD_MDISPS, me->totloop); CustomData_free_layer_active(&me->ldata, CD_MDISPS, me->totloop); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 63c15734803..f64f25391f9 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -138,7 +138,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) makeDerivedMesh(scene, obedit, em, CD_MASK_BAREMESH, 0); BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if(v1==0) v1= nr; else if(v2==0) v2= nr; else if(v3==0) v3= nr; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index f5c80694e54..5520cb32e85 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -206,7 +206,7 @@ static int ED_vgroup_give_parray(ID *id, MDeformVert ***dvert_arr, int *dvert_to i = 0; if (use_vert_sel) { BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - (*dvert_arr)[i] = BM_TestHFlag(eve, BM_ELEM_SELECT) ? + (*dvert_arr)[i] = BM_elem_flag_test(eve, BM_ELEM_SELECT) ? CustomData_em_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT) : NULL; i++; } @@ -522,7 +522,7 @@ static float get_vert_def_nr(Object *ob, const int def_nr, const int vertnum) me= ob->data; if(me->edit_btmesh) { - eve= BM_Vert_AtIndex(me->edit_btmesh->bm, vertnum); + eve= BM_vert_at_index(me->edit_btmesh->bm, vertnum); if(!eve) { return 0.0f; } @@ -593,10 +593,10 @@ static void vgroup_select_verts(Object *ob, int select) BMVert *eve; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { dv= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if (defvert_find_index(dv, def_nr)) { - BM_Select(em->bm, eve, select); + BM_elem_select_set(em->bm, eve, select); } } } @@ -1303,7 +1303,7 @@ static void vgroup_blend(Object *ob) float *vg_users; int sel1, sel2; - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); dvert_tot= em->bm->totvert; @@ -1311,19 +1311,19 @@ static void vgroup_blend(Object *ob) vg_users= MEM_callocN(sizeof(int)*dvert_tot, "vgroup_blend_i"); BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - sel1= BM_TestHFlag(eed->v1, BM_ELEM_SELECT); - sel2= BM_TestHFlag(eed->v2, BM_ELEM_SELECT); + sel1= BM_elem_flag_test(eed->v1, BM_ELEM_SELECT); + sel2= BM_elem_flag_test(eed->v2, BM_ELEM_SELECT); if(sel1 != sel2) { /* i1 is always the selected one */ if(sel1==TRUE && sel2==FALSE) { - i1= BM_GetIndex(eed->v1); - i2= BM_GetIndex(eed->v2); + i1= BM_elem_index_get(eed->v1); + i2= BM_elem_index_get(eed->v2); eve= eed->v2; } else { - i2= BM_GetIndex(eed->v1); - i1= BM_GetIndex(eed->v2); + i2= BM_elem_index_get(eed->v1); + i1= BM_elem_index_get(eed->v2); eve= eed->v1; } @@ -1343,7 +1343,7 @@ static void vgroup_blend(Object *ob) i= 0; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT) && vg_users[i] > 0) { + if(BM_elem_flag_test(eve, BM_ELEM_SELECT) && vg_users[i] > 0) { /* TODO, we may want object mode blending */ if(em) dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); else dvert= dvert_array+i; @@ -1559,8 +1559,8 @@ void ED_vgroup_mirror(Object *ob, const short mirror_weights, const short flip_v /* Go through the list of editverts and assign them */ BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { if((eve_mirr= EDBM_GetMirrorVert(em, eve))) { - sel= BM_TestHFlag(eve, BM_ELEM_SELECT); - sel_mirr= BM_TestHFlag(eve_mirr, BM_ELEM_SELECT); + sel= BM_elem_flag_test(eve, BM_ELEM_SELECT); + sel_mirr= BM_elem_flag_test(eve_mirr, BM_ELEM_SELECT); if((sel || sel_mirr) && (eve != eve_mirr)) { dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); @@ -1785,7 +1785,7 @@ static void vgroup_active_remove_verts(Object *ob, const int allverts, bDeformGr BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { dv= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); - if(dv && dv->dw && (allverts || BM_TestHFlag(eve, BM_ELEM_SELECT))) { + if(dv && dv->dw && (allverts || BM_elem_flag_test(eve, BM_ELEM_SELECT))) { MDeformWeight *dw = defvert_find_index(dv, def_nr); defvert_remove_group(dv, dw); /* dw can be NULL */ } @@ -1981,11 +1981,11 @@ static void vgroup_assign_verts(Object *ob, const float weight) BMVert *eve; if(!CustomData_has_layer(&em->bm->vdata, CD_MDEFORMVERT)) - BM_add_data_layer(em->bm, &em->bm->vdata, CD_MDEFORMVERT); + BM_data_layer_add(em->bm, &em->bm->vdata, CD_MDEFORMVERT); /* Go through the list of editverts and assign them */ BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { MDeformWeight *dw; dv= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); /* can be NULL */ dw= defvert_verify_index(dv, def_nr); diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index fb844de33c3..83b4dfef6c6 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -171,7 +171,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) if(em) { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_TestHFlag(efa, BM_ELEM_SELECT)) + if(BM_elem_flag_test(efa, BM_ELEM_SELECT)) efa->mat_nr= ob->actcol-1; } } diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index e89007b2480..ce07beae674 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -215,7 +215,7 @@ void HC_relaxation_iteration_uv(BMEditMesh *em, UvSculptData *sculptdata, float if(element->separate && element != sculptdata->uv[i].element) break; - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(luv->uv, sculptdata->uv[i].uv); } @@ -279,7 +279,7 @@ static void laplacian_relaxation_iteration_uv(BMEditMesh *em, UvSculptData *scul if(element->separate && element != sculptdata->uv[i].element) break; - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(luv->uv, sculptdata->uv[i].uv); } @@ -355,7 +355,7 @@ static void uv_sculpt_stroke_apply(bContext *C, wmOperator *op, wmEvent *event, if(element->separate && element != sculptdata->uv[i].element) break; - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(luv->uv, sculptdata->uv[i].uv); } @@ -397,7 +397,7 @@ static void uv_sculpt_stroke_apply(bContext *C, wmOperator *op, wmEvent *event, if(element->separate && element != sculptdata->uv[uvindex].element) break; - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); copy_v2_v2(luv->uv, sculptdata->uv[uvindex].uv); } @@ -572,7 +572,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent } efa = element->face; - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, element->face, element->tfindex); luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); counter++; diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index b37a5811cb4..b03ae1aecd6 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -591,7 +591,7 @@ static void image_refresh(const bContext *C, ScrArea *UNUSED(sa)) if(scene_use_new_shading_nodes(scene)) { /* new shading system, get image from material */ - BMFace *efa = BM_get_actFace(em->bm, sloppy); + BMFace *efa = BM_active_face_get(em->bm, sloppy); if(efa) { Image *node_ima; diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 4734d54497d..09a4a9eb749 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -549,7 +549,7 @@ static int draw_em_tf_mapped__set_draw(void *userData, int index) BMEditMesh *em = data->em; BMFace *efa= EDBM_get_face_for_index(em, index); - if (efa==NULL || BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + if (efa==NULL || BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { return 0; } else { @@ -911,7 +911,7 @@ static int tex_mat_set_face_editmesh_cb(void *userData, int index) Mesh *me = (Mesh*)data->me; BMFace *efa= EDBM_get_face_for_index(me->edit_btmesh, index); - return !BM_TestHFlag(efa, BM_ELEM_HIDDEN); + return !BM_elem_flag_test(efa, BM_ELEM_HIDDEN); } void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, int draw_flags) diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 226073c2cf9..b985f441f48 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2006,7 +2006,7 @@ static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co foreachScreenVert_userData *data = userData; BMVert *eve = EDBM_get_vert_for_index(data->vc.em, index); - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { short s[2]= {IS_CLIPPED, 0}; if (data->clipVerts != V3D_CLIP_TEST_OFF) { @@ -2084,7 +2084,7 @@ static void mesh_foreachScreenEdge__mapFunc(void *userData, int index, float *v0 foreachScreenEdge_userData *data = userData; BMEdge *eed = EDBM_get_edge_for_index(data->vc.em, index); - if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { short s[2][2]; if (data->clipVerts == V3D_CLIP_TEST_RV3D_CLIPPING) { @@ -2141,7 +2141,7 @@ static void mesh_foreachScreenFace__mapFunc(void *userData, int index, float *ce foreachScreenFace_userData *data = userData; BMFace *efa = EDBM_get_face_for_index(data->vc.em, index); - if (efa && !BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { float cent2[3]; short s[2]; @@ -2244,7 +2244,7 @@ static void draw_dm_face_normals__mapFunc(void *userData, int index, float *cent drawDMNormal_userData *data = userData; BMFace *efa = EDBM_get_face_for_index(data->em, index); - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { glVertex3fv(cent); glVertex3f(cent[0] + no[0] * data->normalsize, cent[1] + no[1] * data->normalsize, @@ -2268,7 +2268,7 @@ static void draw_dm_face_centers__mapFunc(void *userData, int index, float *cent BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index); int sel = *(((int **)userData)[1]); - if (efa && !BM_TestHFlag(efa, BM_ELEM_HIDDEN) && BM_TestHFlag(efa, BM_ELEM_SELECT)==sel) { + if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT)==sel) { bglVertex3fv(cent); } } @@ -2286,7 +2286,7 @@ static void draw_dm_vert_normals__mapFunc(void *userData, int index, float *co, drawDMNormal_userData *data = userData; BMVert *eve = EDBM_get_vert_for_index(data->em, index); - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { glVertex3fv(co); if (no_f) { @@ -2319,7 +2319,7 @@ static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float * drawDMVerts_userData * data = userData; BMVert *eve = EDBM_get_vert_for_index(data->em, index); - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && BM_TestHFlag(eve, BM_ELEM_SELECT)==data->sel) { + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT)==data->sel) { /* draw active larger - need to stop/start point drawing for this :/ */ if (eve==data->eve_act) { float size = UI_GetThemeValuef(TH_VERTEX_SIZE); @@ -2363,11 +2363,11 @@ static int draw_dm_edges_sel__setDrawOptions(void *userData, int index) eed = EDBM_get_edge_for_index(data->em, index); - if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { if (eed==data->eed_act) { glColor4ubv(data->actCol); } else { - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) { col = data->selCol; } else { col = data->baseCol; @@ -2398,7 +2398,7 @@ static void draw_dm_edges_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *ba /* Draw edges */ static int draw_dm_edges__setDrawOptions(void *userData, int index) { - return !BM_TestHFlag(EDBM_get_edge_for_index(userData, index), BM_ELEM_HIDDEN); + return !BM_elem_flag_test(EDBM_get_edge_for_index(userData, index), BM_ELEM_HIDDEN); } static void draw_dm_edges(BMEditMesh *em, DerivedMesh *dm) { @@ -2408,14 +2408,14 @@ static void draw_dm_edges(BMEditMesh *em, DerivedMesh *dm) /* Draw edges with color interpolated based on selection */ static int draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index) { - return !BM_TestHFlag(EDBM_get_edge_for_index(((void**)userData)[0], index), BM_ELEM_HIDDEN); + return !BM_elem_flag_test(EDBM_get_edge_for_index(((void**)userData)[0], index), BM_ELEM_HIDDEN); } static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int index, float t) { BMEdge *eed = EDBM_get_edge_for_index(((void**)userData)[0], index); unsigned char **cols = userData; - unsigned char *col0 = cols[(BM_TestHFlag(eed->v1, BM_ELEM_SELECT))?2:1]; - unsigned char *col1 = cols[(BM_TestHFlag(eed->v2, BM_ELEM_SELECT))?2:1]; + unsigned char *col0 = cols[(BM_elem_flag_test(eed->v1, BM_ELEM_SELECT))?2:1]; + unsigned char *col1 = cols[(BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))?2:1]; glColor4ub( col0[0] + (col1[0]-col0[0])*t, col0[1] + (col1[1]-col0[1])*t, @@ -2435,7 +2435,7 @@ static int draw_dm_edges_seams__setDrawOptions(void *userData, int index) { BMEdge *eed = EDBM_get_edge_for_index(userData, index); - return !BM_TestHFlag(eed, BM_ELEM_HIDDEN) && BM_TestHFlag(eed, BM_ELEM_SEAM); + return !BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SEAM); } static void draw_dm_edges_seams(BMEditMesh *em, DerivedMesh *dm) @@ -2448,7 +2448,7 @@ static int draw_dm_edges_sharp__setDrawOptions(void *userData, int index) { BMEdge *eed = EDBM_get_edge_for_index(userData, index); - return !BM_TestHFlag(eed, BM_ELEM_HIDDEN) && BM_TestHFlag(eed, BM_ELEM_SHARP); + return !BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SHARP); } static void draw_dm_edges_sharp(BMEditMesh *em, DerivedMesh *dm) { @@ -2467,12 +2467,12 @@ static int draw_dm_faces_sel__setDrawOptions(void *userData, int index, int *UNU if (!efa) return 0; - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { if (efa == data->efa_act) { glColor4ubv(data->cols[2]); return 2; /* stipple */ } else { - col = data->cols[BM_TestHFlag(efa, BM_ELEM_SELECT)?1:0]; + col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT)?1:0]; if (col[3]==0) return 0; glColor4ubv(col); return 1; @@ -2502,8 +2502,8 @@ static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int if(efa == data->efa_act || next_efa == data->efa_act) return 0; - col = data->cols[BM_TestHFlag(efa, BM_ELEM_SELECT)?1:0]; - next_col = data->cols[BM_TestHFlag(next_efa, BM_ELEM_SELECT)?1:0]; + col = data->cols[BM_elem_flag_test(efa, BM_ELEM_SELECT)?1:0]; + next_col = data->cols[BM_elem_flag_test(next_efa, BM_ELEM_SELECT)?1:0]; if(col[3]==0 || next_col[3]==0) return 0; @@ -2536,7 +2536,7 @@ static int draw_dm_creases__setDrawOptions(void *userData, int index) if (!crease) return 0; - if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN) && *crease!=0.0f) { + if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && *crease!=0.0f) { UI_ThemeColorBlend(TH_WIRE, TH_EDGE_CREASE, *crease); return 1; } else { @@ -2559,7 +2559,7 @@ static int draw_dm_bweights__setDrawOptions(void *userData, int index) if (!bweight) return 0; - if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN) && *bweight!=0.0f) { + if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && *bweight!=0.0f) { UI_ThemeColorBlend(TH_WIRE, TH_EDGE_SELECT, *bweight); return 1; } else { @@ -2575,7 +2575,7 @@ static void draw_dm_bweights__mapFunc(void *userData, int index, float *co, floa if (!bweight) return; - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && *bweight!=0.0f) { + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && *bweight!=0.0f) { UI_ThemeColorBlend(TH_VERTEX, TH_VERTEX_SELECT, *bweight); bglVertex3fv(co); } @@ -2753,11 +2753,11 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col); - eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - for(; eed; eed=BMIter_Step(&iter)) { + eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + for(; eed; eed=BM_iter_step(&iter)) { /* draw selected edges, or edges next to selected verts while draging */ - if(BM_TestHFlag(eed, BM_ELEM_SELECT) || - (do_moving && (BM_TestHFlag(eed->v1, BM_ELEM_SELECT) || BM_TestHFlag(eed->v2, BM_ELEM_SELECT) ))) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT) || + (do_moving && (BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || BM_elem_flag_test(eed->v2, BM_ELEM_SELECT) ))) { copy_v3_v3(v1, eed->v1->co); copy_v3_v3(v2, eed->v2->co); @@ -2783,13 +2783,13 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS } if(me->drawflag & ME_DRAWEXTRA_FACEAREA) { - /* would be nice to use BM_Compute_Face_Area, but that is for 2d faces + /* would be nice to use BM_face_area_calc, but that is for 2d faces so instead add up tessalation triangle areas */ BMFace *f; int n; #define DRAW_EM_MEASURE_STATS_FACEAREA() \ - if (BM_TestHFlag(f, BM_ELEM_SELECT)) { \ + if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { \ mul_v3_fl(vmid, 1.0/n); \ if(unit->system) \ bUnit_AsString(numstr, sizeof(numstr), area*unit->scale_length, \ @@ -2842,15 +2842,15 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col); - for(efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); - efa; efa=BMIter_Step(&iter)) { + for(efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); + efa; efa=BM_iter_step(&iter)) { BMIter liter; BMLoop *loop; - BM_Compute_Face_CenterBounds(em->bm, efa, vmid); + BM_face_center_bounds_calc(em->bm, efa, vmid); - for(loop = BMIter_New(&liter, em->bm, BM_LOOPS_OF_FACE, efa); - loop; loop = BMIter_Step(&liter)) { + for(loop = BM_iter_new(&liter, em->bm, BM_LOOPS_OF_FACE, efa); + loop; loop = BM_iter_step(&liter)) { float v1[3], v2[3], v3[3]; @@ -2864,8 +2864,8 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS mul_mat3_m4_v3(ob->obmat, v3); } - if ( (BM_TestHFlag(efa, BM_ELEM_SELECT)) || - (do_moving && BM_TestHFlag(loop->v, BM_ELEM_SELECT))) + if ( (BM_elem_flag_test(efa, BM_ELEM_SELECT)) || + (do_moving && BM_elem_flag_test(loop->v, BM_ELEM_SELECT))) { BLI_snprintf(numstr, sizeof(numstr), "%.3g", RAD2DEGF(angle_v3v3v3(v1, v2, v3))); interp_v3_v3v3(fvec, vmid, v2, 0.8f); @@ -2894,7 +2894,7 @@ static void draw_em_indices(BMEditMesh *em) if (em->selectmode & SCE_SELECT_VERTEX) { UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEANG, col); BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { sprintf(numstr, "%d", i); view3d_cached_text_draw_add(v->co, numstr, 0, V3D_CACHE_TEXT_ASCII, col); } @@ -2906,7 +2906,7 @@ static void draw_em_indices(BMEditMesh *em) i= 0; UI_GetThemeColor3ubv(TH_DRAWEXTRA_EDGELEN, col); BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { sprintf(numstr, "%d", i); mid_v3_v3v3(pos, e->v1->co, e->v2->co); view3d_cached_text_draw_add(pos, numstr, 0, V3D_CACHE_TEXT_ASCII, col); @@ -2919,8 +2919,8 @@ static void draw_em_indices(BMEditMesh *em) i= 0; UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col); BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(f, BM_ELEM_SELECT)) { - BM_Compute_Face_CenterMean(bm, f, pos); + if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { + BM_face_center_mean_calc(bm, f, pos); sprintf(numstr, "%d", i); view3d_cached_text_draw_add(pos, numstr, 0, V3D_CACHE_TEXT_ASCII, col); } @@ -2933,7 +2933,7 @@ static int draw_em_fancy__setFaceOpts(void *userData, int index, int *UNUSED(dra { BMFace *efa = EDBM_get_face_for_index(userData, index); - if (efa && !BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { GPU_enable_material(efa->mat_nr+1, NULL); return 1; } @@ -2945,7 +2945,7 @@ static int draw_em_fancy__setGLSLFaceOpts(void *userData, int index) { BMFace *efa = EDBM_get_face_for_index(userData, index); - return !BM_TestHFlag(efa, BM_ELEM_HIDDEN); + return !BM_elem_flag_test(efa, BM_ELEM_HIDDEN); } static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, @@ -2953,7 +2953,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, { Mesh *me = ob->data; - BMFace *efa_act = BM_get_actFace(em->bm, FALSE); /* annoying but active faces is stored differently */ + BMFace *efa_act = BM_active_face_get(em->bm, FALSE); /* annoying but active faces is stored differently */ BMEdge *eed_act = NULL; BMVert *eve_act = NULL; @@ -7050,7 +7050,7 @@ static void bbs_mesh_verts__mapFunc(void *userData, int index, float *co, float int offset = (intptr_t) ptrs[0]; BMVert *eve = EDBM_get_vert_for_index(ptrs[1], index); - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { WM_set_framebuffer_index_color(offset+index); bglVertex3fv(co); } @@ -7072,7 +7072,7 @@ static int bbs_mesh_wire__setDrawOptions(void *userData, int index) int offset = (intptr_t) ptrs[0]; BMEdge *eed = EDBM_get_edge_for_index(ptrs[1], index); - if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { WM_set_framebuffer_index_color(offset+index); return 1; } else { @@ -7089,7 +7089,7 @@ static int bbs_mesh_solid__setSolidDrawOptions(void *userData, int index, int *U { BMFace *efa = EDBM_get_face_for_index(((void**)userData)[0], index); - if (efa && !BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { if (((void**)userData)[1]) { WM_set_framebuffer_index_color(index+1); } @@ -7103,7 +7103,7 @@ static void bbs_mesh_solid__drawCenter(void *userData, int index, float *cent, f { BMFace *efa = EDBM_get_face_for_index(((void**)userData)[0], index); - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { WM_set_framebuffer_index_color(index+1); bglVertex3fv(cent); diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index d2ea10de2ba..5d587bcd075 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -161,7 +161,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float BMIter iter; BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eve, BM_ELEM_SELECT)) { evedef= eve; tot++; add_v3_v3(median, eve->co); @@ -169,7 +169,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if(BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) { float *f; totedge++; @@ -419,7 +419,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float if(len_v3(median) > 0.000001f) { BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eve, BM_ELEM_SELECT)) { add_v3_v3(eve->co, median); } } @@ -435,7 +435,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float /* simple case */ BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if(BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) { float *crease = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); if (!crease) break; @@ -457,7 +457,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float const float sca= median_new / median_orig; BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if(BM_TestHFlag(eed, BM_ELEM_SELECT) && !BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { float *crease = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); if (!crease) break; @@ -472,7 +472,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float const float sca= (1.0f - median_new) / (1.0f - median_orig); BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if(BM_TestHFlag(eed, BM_ELEM_SELECT) && !BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { float *crease = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); if (!crease) break; @@ -688,7 +688,7 @@ static void vgroup_copy_active_to_sel(Object *ob) int index= 0; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT) && eve != eve_act) { + if(BM_elem_flag_test(eve, BM_ELEM_SELECT) && eve != eve_act) { dvert= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); if(dvert) { defvert_copy(dvert, dvert_act); @@ -731,9 +731,9 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr) weight_act= dw->weight; - eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL); - for (index=0; eve; eve=BMIter_Step(&iter), index++) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT) && eve != eve_act) { + eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL); + for (index=0; eve; eve=BM_iter_step(&iter), index++) { + if(BM_elem_flag_test(eve, BM_ELEM_SELECT) && eve != eve_act) { dv= CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); dw= defvert_find_index(dv, def_nr); if (dw) { diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index d0a4ac14c20..989feaedb40 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -171,11 +171,11 @@ static void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select) BMIter iter; int index= bm_wireoffs; - eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL); - for ( ; eve; eve=BMIter_Step(&iter), index++) { - if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + eve = BM_iter_new(&iter, em->bm, BM_VERTS_OF_MESH, NULL); + for ( ; eve; eve=BM_iter_step(&iter), index++) { + if(!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { if(EDBM_check_backbuf(index)) { - BM_Select_Vert(em->bm, eve, select); + BM_vert_select(em->bm, eve, select); } } } @@ -187,11 +187,11 @@ static void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select) BMIter iter; int index= bm_solidoffs; - eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); - for ( ; eed; eed=BMIter_Step(&iter), index++) { - if(!BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { + eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); + for ( ; eed; eed=BM_iter_step(&iter), index++) { + if(!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { if(EDBM_check_backbuf(index)) { - BM_Select_Edge(em->bm, eed, select); + BM_edge_select(em->bm, eed, select); } } } @@ -203,11 +203,11 @@ static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select) BMIter iter; int index= 1; - efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); - for ( ; efa; efa=BMIter_Step(&iter), index++) { - if(!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { + efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); + for ( ; efa; efa=BM_iter_step(&iter), index++) { + if(!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { if(EDBM_check_backbuf(index)) { - BM_Select_Face(em->bm, efa, select); + BM_face_select(em->bm, efa, select); } } } @@ -473,7 +473,7 @@ static void do_lasso_select_mesh__doSelectVert(void *userData, BMVert *eve, int LassoSelectUserData *data = userData; if (BLI_in_rcti(data->rect, x, y) && lasso_inside(data->mcords, data->moves, x, y)) { - BM_Select(data->vc->em->bm, eve, data->select); + BM_elem_select_set(data->vc->em->bm, eve, data->select); } } static void do_lasso_select_mesh__doSelectEdge(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index) @@ -485,12 +485,12 @@ static void do_lasso_select_mesh__doSelectEdge(void *userData, BMEdge *eed, int if ( edge_fully_inside_rect(data->rect, x0, y0, x1, y1) && lasso_inside(data->mcords, data->moves, x0, y0) && lasso_inside(data->mcords, data->moves, x1, y1)) { - BM_Select(data->vc->em->bm, eed, data->select); + BM_elem_select_set(data->vc->em->bm, eed, data->select); data->done = 1; } } else { if (lasso_inside_edge(data->mcords, data->moves, x0, y0, x1, y1)) { - BM_Select(data->vc->em->bm, eed, data->select); + BM_elem_select_set(data->vc->em->bm, eed, data->select); } } } @@ -500,7 +500,7 @@ static void do_lasso_select_mesh__doSelectFace(void *userData, BMFace *efa, int LassoSelectUserData *data = userData; if (BLI_in_rcti(data->rect, x, y) && lasso_inside(data->mcords, data->moves, x, y)) { - BM_Select(data->vc->em->bm, efa, data->select); + BM_elem_select_set(data->vc->em->bm, efa, data->select); } } @@ -1741,7 +1741,7 @@ static void do_mesh_box_select__doSelectVert(void *userData, BMVert *eve, int x, BoxSelectUserData *data = userData; if (BLI_in_rcti(data->rect, x, y)) { - BM_Select(data->vc->em->bm, eve, data->select); + BM_elem_select_set(data->vc->em->bm, eve, data->select); } } static void do_mesh_box_select__doSelectEdge(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int index) @@ -1751,12 +1751,12 @@ static void do_mesh_box_select__doSelectEdge(void *userData, BMEdge *eed, int x0 if(EDBM_check_backbuf(bm_solidoffs+index)) { if (data->pass==0) { if (edge_fully_inside_rect(data->rect, x0, y0, x1, y1)) { - BM_Select(data->vc->em->bm, eed, data->select); + BM_elem_select_set(data->vc->em->bm, eed, data->select); data->done = 1; } } else { if (edge_inside_rect(data->rect, x0, y0, x1, y1)) { - BM_Select(data->vc->em->bm, eed, data->select); + BM_elem_select_set(data->vc->em->bm, eed, data->select); } } } @@ -1766,7 +1766,7 @@ static void do_mesh_box_select__doSelectFace(void *userData, BMFace *efa, int x, BoxSelectUserData *data = userData; if (BLI_in_rcti(data->rect, x, y)) { - BM_Select(data->vc->em->bm, efa, data->select); + BM_elem_select_set(data->vc->em->bm, efa, data->select); } } static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int extend) @@ -2284,7 +2284,7 @@ static void mesh_circle_doSelectVert(void *userData, BMVert *eve, int x, int y, float r = sqrt(mx*mx + my*my); if (r<=data->radius) { - BM_Select(data->vc->em->bm, eve, data->select); + BM_elem_select_set(data->vc->em->bm, eve, data->select); } } static void mesh_circle_doSelectEdge(void *userData, BMEdge *eed, int x0, int y0, int x1, int y1, int UNUSED(index)) @@ -2292,7 +2292,7 @@ static void mesh_circle_doSelectEdge(void *userData, BMEdge *eed, int x0, int y0 CircleSelectUserData *data = userData; if (edge_inside_circle(data->mval[0], data->mval[1], (short) data->radius, x0, y0, x1, y1)) { - BM_Select(data->vc->em->bm, eed, data->select); + BM_elem_select_set(data->vc->em->bm, eed, data->select); } } static void mesh_circle_doSelectFace(void *userData, BMFace *efa, int x, int y, int UNUSED(index)) @@ -2302,7 +2302,7 @@ static void mesh_circle_doSelectFace(void *userData, BMFace *efa, int x, int y, float r = sqrt(mx*mx + my*my); if (r<=data->radius) { - BM_Select(data->vc->em->bm, efa, data->select); + BM_elem_select_set(data->vc->em->bm, efa, data->select); } } diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index de15ea99256..087ed8380d6 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -102,7 +102,7 @@ static void special_transvert_update(Object *obedit) if(obedit->type==OB_MESH) { Mesh *me= obedit->data; - BM_Compute_Normals(me->edit_btmesh->bm); // does face centers too + BM_mesh_normals_update(me->edit_btmesh->bm); // does face centers too } else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) { Curve *cu= obedit->data; @@ -200,9 +200,9 @@ static void set_mapped_co(void *vuserdata, int index, float *co, float *UNUSED(n TransVert *tv = userdata[1]; BMVert *eve = EDBM_get_vert_for_index(em, index); - if (BM_GetIndex(eve) != -1 && !(tv[BM_GetIndex(eve)].flag & TX_VERT_USE_MAPLOC)) { - copy_v3_v3(tv[BM_GetIndex(eve)].maploc, co); - tv[BM_GetIndex(eve)].flag |= TX_VERT_USE_MAPLOC; + if (BM_elem_index_get(eve) != -1 && !(tv[BM_elem_index_get(eve)].flag & TX_VERT_USE_MAPLOC)) { + copy_v3_v3(tv[BM_elem_index_get(eve)].maploc, co); + tv[BM_elem_index_get(eve)].flag |= TX_VERT_USE_MAPLOC; } } @@ -242,48 +242,48 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) tottrans= 0; if(em->selectmode & SCE_SELECT_VERTEX) { BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && BM_TestHFlag(eve, BM_ELEM_SELECT)) { - BM_SetIndex(eve, 1); /* set_dirty! */ + if(!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT)) { + BM_elem_index_set(eve, 1); /* set_dirty! */ tottrans++; } - else BM_SetIndex(eve, 0); /* set_dirty! */ + else BM_elem_index_set(eve, 0); /* set_dirty! */ } } else if(em->selectmode & SCE_SELECT_EDGE) { BMEdge *eed; BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) - BM_SetIndex(eve, 0); /* set_dirty! */ + BM_elem_index_set(eve, 0); /* set_dirty! */ BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if(!BM_TestHFlag(eed, BM_ELEM_HIDDEN) && BM_TestHFlag(eed, BM_ELEM_SELECT)) { - BM_SetIndex(eed->v1, 1); /* set_dirty! */ - BM_SetIndex(eed->v2, 1); /* set_dirty! */ + if(!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SELECT)) { + BM_elem_index_set(eed->v1, 1); /* set_dirty! */ + BM_elem_index_set(eed->v2, 1); /* set_dirty! */ } } BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) - if(BM_GetIndex(eve)) tottrans++; + if(BM_elem_index_get(eve)) tottrans++; } else { BMFace *efa; BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) - BM_SetIndex(eve, 0); /* set_dirty! */ + BM_elem_index_set(eve, 0); /* set_dirty! */ BM_ITER(efa, &iter, bm, BM_FACES_OF_MESH, NULL) { - if(!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if(!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BMIter liter; BMLoop *l; BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, efa) { - BM_SetIndex(l->v, 1); /* set_dirty! */ + BM_elem_index_set(l->v, 1); /* set_dirty! */ } } } BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) - if(BM_GetIndex(eve)) tottrans++; + if(BM_elem_index_get(eve)) tottrans++; } /* for any of the 3 loops above which all dirty the indicies */ bm->elem_index_dirty |= BM_VERT; @@ -294,16 +294,16 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) a = 0; BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if(BM_GetIndex(eve)) { - BM_SetIndex(eve, a); /* set_dirty! */ + if(BM_elem_index_get(eve)) { + BM_elem_index_set(eve, a); /* set_dirty! */ copy_v3_v3(tv->oldloc, eve->co); tv->loc= eve->co; if(eve->no[0] != 0.0f || eve->no[1] != 0.0f ||eve->no[2] != 0.0f) tv->nor= eve->no; // note this is a hackish signal (ton) - tv->flag= BM_GetIndex(eve) & SELECT; + tv->flag= BM_elem_index_get(eve) & SELECT; tv++; a++; - } else BM_SetIndex(eve, -1); /* set_dirty! */ + } else BM_elem_index_set(eve, -1); /* set_dirty! */ } /* set dirty already, above */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index b15085efd75..82d6672e54d 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4294,7 +4294,7 @@ static BMEdge *get_other_edge(BMesh *bm, BMVert *v, BMEdge *e) BMEdge *e2; BM_ITER(e2, &iter, bm, BM_EDGES_OF_VERT, v) { - if (BM_TestHFlag(e2, BM_ELEM_SELECT) && e2 != e) + if (BM_elem_flag_test(e2, BM_ELEM_SELECT) && e2 != e) return e2; } @@ -4310,7 +4310,7 @@ static BMLoop *get_next_loop(BMesh *UNUSED(bm), BMVert *v, BMLoop *l, firstl = l; do { - l = BM_OtherFaceLoop(l->e, l->f, v); + l = BM_face_other_loop(l->e, l->f, v); if (l->radial_next == l) return NULL; @@ -4320,8 +4320,8 @@ static BMLoop *get_next_loop(BMesh *UNUSED(bm), BMVert *v, BMLoop *l, } else { float f1[3], f2[3], f3[3]; - sub_v3_v3v3(f1, BM_OtherEdgeVert(olde, v)->co, v->co); - sub_v3_v3v3(f2, BM_OtherEdgeVert(nexte, v)->co, v->co); + sub_v3_v3v3(f1, BM_edge_other_vert(olde, v)->co, v->co); + sub_v3_v3v3(f2, BM_edge_other_vert(nexte, v)->co, v->co); cross_v3_v3v3(f3, f1, l->f->no); cross_v3_v3v3(a, f2, l->f->no); @@ -4334,17 +4334,17 @@ static BMLoop *get_next_loop(BMesh *UNUSED(bm), BMVert *v, BMLoop *l, copy_v3_v3(vec, a); return l; } else { - sub_v3_v3v3(n, BM_OtherEdgeVert(l->e, v)->co, v->co); + sub_v3_v3v3(n, BM_edge_other_vert(l->e, v)->co, v->co); add_v3_v3v3(a, a, n); i += 1; } - if (BM_OtherFaceLoop(l->e, l->f, v)->e == nexte) { + if (BM_face_other_loop(l->e, l->f, v)->e == nexte) { if (i) mul_v3_fl(a, 1.0f / (float)i); copy_v3_v3(vec, a); - return BM_OtherFaceLoop(l->e, l->f, v); + return BM_face_other_loop(l->e, l->f, v); } l = l->radial_next; @@ -4392,10 +4392,10 @@ static int createSlideVerts(TransInfo *t) /*ensure valid selection*/ BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { numsel = 0; BM_ITER(e, &iter2, em->bm, BM_EDGES_OF_VERT, v) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { /*BMESH_TODO: this is probably very evil, set v->e to a selected edge*/ v->e = e; @@ -4411,21 +4411,21 @@ static int createSlideVerts(TransInfo *t) } BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { - if (BM_Edge_FaceCount(e) != 2) + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { + if (BM_edge_face_count(e) != 2) return 0; //can only handle exactly 2 faces around each edge } } j = 0; BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT)) { - BM_SetHFlag(v, BM_ELEM_TAG); + if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { + BM_elem_flag_set(v, BM_ELEM_TAG); BLI_smallhash_insert(&table, (uintptr_t)v, SET_INT_IN_POINTER(j)); j += 1; } else { - BM_ClearHFlag(v, BM_ELEM_TAG); + BM_elem_flag_clear(v, BM_ELEM_TAG); } } @@ -4438,7 +4438,7 @@ static int createSlideVerts(TransInfo *t) while (1) { v = NULL; BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_TAG)) + if (BM_elem_flag_test(v, BM_ELEM_TAG)) break; } @@ -4465,24 +4465,24 @@ static int createSlideVerts(TransInfo *t) numsel += 1; - if (!BM_TestHFlag(BM_OtherEdgeVert(e, v), BM_ELEM_TAG)) + if (!BM_elem_flag_test(BM_edge_other_vert(e, v), BM_ELEM_TAG)) break; - v = BM_OtherEdgeVert(e, v); + v = BM_edge_other_vert(e, v); } while (e != first->e); - BM_ClearHFlag(v, BM_ELEM_TAG); + BM_elem_flag_clear(v, BM_ELEM_TAG); l1 = l2 = l = NULL; l1 = e->l; l2 = e->l->radial_next; - l = BM_OtherFaceLoop(l1->e, l1->f, v); - sub_v3_v3v3(vec, BM_OtherEdgeVert(l->e, v)->co, v->co); + l = BM_face_other_loop(l1->e, l1->f, v); + sub_v3_v3v3(vec, BM_edge_other_vert(l->e, v)->co, v->co); if (l2 != l1) { - l = BM_OtherFaceLoop(l2->e, l2->f, v); - sub_v3_v3v3(vec2, BM_OtherEdgeVert(l->e, v)->co, v->co); + l = BM_face_other_loop(l2->e, l2->f, v); + sub_v3_v3v3(vec2, BM_edge_other_vert(l->e, v)->co, v->co); } else { l2 = NULL; } @@ -4498,37 +4498,37 @@ static int createSlideVerts(TransInfo *t) if (l2) copy_v3_v3(sv->downvec, vec2); - l = BM_OtherFaceLoop(l1->e, l1->f, v); - sv->up = BM_OtherEdgeVert(l->e, v); + l = BM_face_other_loop(l1->e, l1->f, v); + sv->up = BM_edge_other_vert(l->e, v); if (l2) { - l = BM_OtherFaceLoop(l2->e, l2->f, v); - sv->down = BM_OtherEdgeVert(l->e, v); + l = BM_face_other_loop(l2->e, l2->f, v); + sv->down = BM_edge_other_vert(l->e, v); } - v2=v, v = BM_OtherEdgeVert(e, v); + v2=v, v = BM_edge_other_vert(e, v); e1 = e; e = get_other_edge(bm, v, e); if (!e) { - //v2=v, v = BM_OtherEdgeVert(l1->e, v); + //v2=v, v = BM_edge_other_vert(l1->e, v); sv = tempsv + j + 1; sv->v = v; sv->origvert = *v; - l = BM_OtherFaceLoop(l1->e, l1->f, v); - sv->up = BM_OtherEdgeVert(l->e, v); - sub_v3_v3v3(sv->upvec, BM_OtherEdgeVert(l->e, v)->co, v->co); + l = BM_face_other_loop(l1->e, l1->f, v); + sv->up = BM_edge_other_vert(l->e, v); + sub_v3_v3v3(sv->upvec, BM_edge_other_vert(l->e, v)->co, v->co); if (l2) { - l = BM_OtherFaceLoop(l2->e, l2->f, v); - sv->down = BM_OtherEdgeVert(l->e, v); - sub_v3_v3v3(sv->downvec, BM_OtherEdgeVert(l->e, v)->co, v->co); + l = BM_face_other_loop(l2->e, l2->f, v); + sv->down = BM_edge_other_vert(l->e, v); + sub_v3_v3v3(sv->downvec, BM_edge_other_vert(l->e, v)->co, v->co); } - BM_ClearHFlag(v, BM_ELEM_TAG); - BM_ClearHFlag(v2, BM_ELEM_TAG); + BM_elem_flag_clear(v, BM_ELEM_TAG); + BM_elem_flag_clear(v2, BM_ELEM_TAG); j += 2; break; @@ -4539,8 +4539,8 @@ static int createSlideVerts(TransInfo *t) j += 1; - BM_ClearHFlag(v, BM_ELEM_TAG); - BM_ClearHFlag(v2, BM_ELEM_TAG); + BM_elem_flag_clear(v, BM_ELEM_TAG); + BM_elem_flag_clear(v2, BM_ELEM_TAG); } while (e != first->e && l1); } @@ -4555,7 +4555,7 @@ static int createSlideVerts(TransInfo *t) zero_v3(lastvec); zero_v3(dir); ee = le = NULL; BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(e, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(e, BM_ELEM_SELECT)) { BMIter iter2; BMEdge *e2; float vec1[3], dis2, mval[2] = {t->mval[0], t->mval[1]}, d; @@ -4566,7 +4566,7 @@ static int createSlideVerts(TransInfo *t) for (i=0; i<2; i++) { v = i?e->v1:e->v2; BM_ITER(e2, &iter2, em->bm, BM_EDGES_OF_VERT, v) { - if (BM_TestHFlag(e2, BM_ELEM_SELECT)) + if (BM_elem_flag_test(e2, BM_ELEM_SELECT)) continue; if (!BMBVH_EdgeVisible(btree, e2, ar, v3d, t->obedit)) @@ -4613,15 +4613,15 @@ static int createSlideVerts(TransInfo *t) BM_ITER(f, &fiter, em->bm, BM_FACES_OF_VERT, tempsv->v) { if (!BLI_smallhash_haskey(&sld->origfaces, (uintptr_t)f)) { - BMFace *copyf = BM_Copy_Face(em->bm, f, 1, 1); + BMFace *copyf = BM_face_copy(em->bm, f, 1, 1); - BM_Select(em->bm, copyf, FALSE); - BM_SetHFlag(copyf, BM_ELEM_HIDDEN); + BM_elem_select_set(em->bm, copyf, FALSE); + BM_elem_flag_set(copyf, BM_ELEM_HIDDEN); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, copyf) { - BM_Select(em->bm, l->v, FALSE); - BM_SetHFlag(l->v, BM_ELEM_HIDDEN); - BM_Select(em->bm, l->e, FALSE); - BM_SetHFlag(l->e, BM_ELEM_HIDDEN); + BM_elem_select_set(em->bm, l->v, FALSE); + BM_elem_flag_set(l->v, BM_ELEM_HIDDEN); + BM_elem_select_set(em->bm, l->e, FALSE); + BM_elem_flag_set(l->e, BM_ELEM_HIDDEN); } BLI_smallhash_insert(&sld->origfaces, (uintptr_t)f, copyf); @@ -4693,8 +4693,8 @@ void projectSVData(TransInfo *t, int final) /*the face attributes of the copied face will get copied over, so its necessary to save the selection and hidden state*/ - sel = BM_TestHFlag(f, BM_ELEM_SELECT); - hide = BM_TestHFlag(f, BM_ELEM_HIDDEN); + sel = BM_elem_flag_test(f, BM_ELEM_SELECT); + hide = BM_elem_flag_test(f, BM_ELEM_HIDDEN); copyf2 = BLI_smallhash_lookup(&sld->origfaces, (uintptr_t)f); @@ -4703,17 +4703,17 @@ void projectSVData(TransInfo *t, int final) copyf = copyf2; do_vdata = l2->v==tempsv->v; - if (BM_TestHFlag(l2->e, BM_ELEM_SELECT) || BM_TestHFlag(l2->prev->e, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(l2->e, BM_ELEM_SELECT) || BM_elem_flag_test(l2->prev->e, BM_ELEM_SELECT)) { BMLoop *l3 = l2; do_vdata = 1; - if (!BM_TestHFlag(l2->e, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(l2->e, BM_ELEM_SELECT)) l3 = l3->prev; - if (sld->perc < 0.0 && BM_Vert_In_Face(l3->radial_next->f, tempsv->down)) { + if (sld->perc < 0.0 && BM_vert_in_face(l3->radial_next->f, tempsv->down)) { copyf = BLI_smallhash_lookup(&sld->origfaces, (uintptr_t)l3->radial_next->f); - } else if (sld->perc > 0.0 && BM_Vert_In_Face(l3->radial_next->f, tempsv->up)) { + } else if (sld->perc > 0.0 && BM_vert_in_face(l3->radial_next->f, tempsv->up)) { copyf = BLI_smallhash_lookup(&sld->origfaces, (uintptr_t)l3->radial_next->f); } if (!copyf) @@ -4731,11 +4731,11 @@ void projectSVData(TransInfo *t, int final) } /*make sure face-attributes are correct (e.g. MTexPoly)*/ - BM_Copy_Attributes(em->bm, em->bm, copyf2, f); + BM_elem_copy_attrs(em->bm, em->bm, copyf2, f); /*restore selection and hidden flags*/ - BM_Select(em->bm, f, sel); - BM_Hide(em->bm, f, hide); + BM_elem_select_set(em->bm, f, sel); + BM_elem_hide_set(em->bm, f, hide); } } @@ -4779,7 +4779,7 @@ void freeSlideVerts(TransInfo *t) copyf = BLI_smallhash_iternew(&sld->origfaces, &hiter, NULL); for (; copyf; copyf=BLI_smallhash_iternext(&hiter, NULL)) { - BM_Kill_Face_Verts(sld->em->bm, copyf); + BM_face_verts_kill(sld->em->bm, copyf); } sld->em->bm->ob = t->obedit; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 794e6e0cf30..c2cd1b8378b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -311,8 +311,8 @@ static void createTransEdge(TransInfo *t) int propmode = t->flag & T_PROP_EDIT; BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) countsel++; + if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) countsel++; if (propmode) count++; } } @@ -333,7 +333,7 @@ static void createTransEdge(TransInfo *t) invert_m3_m3(smtx, mtx); BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if(!BM_TestHFlag(eed, BM_ELEM_HIDDEN) && (BM_TestHFlag(eed, BM_ELEM_SELECT) || propmode)) { + if(!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && (BM_elem_flag_test(eed, BM_ELEM_SELECT) || propmode)) { float *bweight = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT); float *crease = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE); @@ -342,7 +342,7 @@ static void createTransEdge(TransInfo *t) mul_v3_fl(td->center, 0.5f); td->loc= NULL; - if (BM_TestHFlag(eed, BM_ELEM_SELECT)) + if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) td->flag= TD_SELECTED; else td->flag= 0; @@ -1880,19 +1880,19 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f fill_vn_fl(dists, em->bm->totvert, FLT_MAX); - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); BLI_smallhash_init(visit); BM_ITER(v, &viter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(v, BM_ELEM_SELECT)==0 || BM_TestHFlag(v, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(v, BM_ELEM_SELECT)==0 || BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; BLI_smallhash_insert(visit, (uintptr_t)v, NULL); BLI_array_append(queue, v); BLI_array_append(dqueue, 0.0f); - dists[BM_GetIndex(v)] = 0.0f; + dists[BM_elem_index_get(v)] = 0.0f; } start = 0; @@ -1907,9 +1907,9 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f BM_ITER(e, &eiter, em->bm, BM_EDGES_OF_VERT, v2) { float d2; - v3 = BM_OtherEdgeVert(e, v2); + v3 = BM_edge_other_vert(e, v2); - if (BM_TestHFlag(v3, BM_ELEM_SELECT) || BM_TestHFlag(v3, BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(v3, BM_ELEM_SELECT) || BM_elem_flag_test(v3, BM_ELEM_HIDDEN)) continue; sub_v3_v3v3(vec, v2->co, v3->co); @@ -1917,12 +1917,12 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f d2 = d + len_v3(vec); - if (dists[BM_GetIndex(v3)] != FLT_MAX) - dists[BM_GetIndex(v3)] = MIN2(d2, dists[BM_GetIndex(v3)]); + if (dists[BM_elem_index_get(v3)] != FLT_MAX) + dists[BM_elem_index_get(v3)] = MIN2(d2, dists[BM_elem_index_get(v3)]); else - dists[BM_GetIndex(v3)] = d2; + dists[BM_elem_index_get(v3)] = d2; - tots[BM_GetIndex(v3)] = 1; + tots[BM_elem_index_get(v3)] = 1; if (BLI_smallhash_haskey(visit, (uintptr_t)v3)) continue; @@ -1956,8 +1956,8 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f BMIter iter; BM_ITER(efa, &iter, bm, BM_FACES_OF_VERT, eve) { - if (BM_Selected(bm, efa)) { - BM_Compute_Face_CenterMean(bm, efa, cent_r); + if (BM_elem_select_test(bm, efa)) { + BM_face_center_mean_calc(bm, efa, cent_r); break; } } @@ -1969,7 +1969,7 @@ static void get_edge_center(float cent_r[3], BMesh *bm, BMVert *eve) BMIter iter; BM_ITER(eed, &iter, bm, BM_EDGES_OF_VERT, eve) { - if (BM_Selected(bm, eed)) { + if (BM_elem_select_test(bm, eed)) { mid_v3_v3v3(cent_r, eed->v1->co, eed->v2->co); break; } @@ -2049,42 +2049,42 @@ static void createTransEditVerts(bContext *C, TransInfo *t) // transform now requires awareness for select mode, so we tag the f1 flags in verts if(selectmode & SCE_SELECT_VERTEX) { BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if (BM_Selected(bm, eve)) { - BM_SetHFlag(eve, BM_ELEM_TAG); + if (BM_elem_select_test(bm, eve)) { + BM_elem_flag_set(eve, BM_ELEM_TAG); } else { - BM_ClearHFlag(eve, BM_ELEM_TAG); + BM_elem_flag_clear(eve, BM_ELEM_TAG); } } } else if(selectmode & SCE_SELECT_EDGE) { BMEdge *eed; - eve = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL); - for( ; eve; eve=BMIter_Step(&iter)) BM_ClearHFlag(eve, BM_ELEM_TAG); + eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); + for( ; eve; eve=BM_iter_step(&iter)) BM_elem_flag_clear(eve, BM_ELEM_TAG); - eed = BMIter_New(&iter, bm, BM_EDGES_OF_MESH, NULL); - for( ; eed; eed=BMIter_Step(&iter)) { - if (BM_Selected(bm, eed)) { - BM_SetHFlag(eed->v1, BM_ELEM_TAG); - BM_SetHFlag(eed->v2, BM_ELEM_TAG); + eed = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL); + for( ; eed; eed=BM_iter_step(&iter)) { + if (BM_elem_select_test(bm, eed)) { + BM_elem_flag_set(eed->v1, BM_ELEM_TAG); + BM_elem_flag_set(eed->v2, BM_ELEM_TAG); } } } else { BMFace *efa; - eve = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL); - for( ; eve; eve=BMIter_Step(&iter)) BM_ClearHFlag(eve, BM_ELEM_TAG); + eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); + for( ; eve; eve=BM_iter_step(&iter)) BM_elem_flag_clear(eve, BM_ELEM_TAG); - efa = BMIter_New(&iter, bm, BM_FACES_OF_MESH, NULL); - for( ; efa; efa=BMIter_Step(&iter)) { - if (BM_Selected(bm, efa)) { + efa = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL); + for( ; efa; efa=BM_iter_step(&iter)) { + if (BM_elem_select_test(bm, efa)) { BMIter liter; BMLoop *l; - l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, efa); - for (; l; l=BMIter_Step(&liter)) { - BM_SetHFlag(l->v, BM_ELEM_TAG); + l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, efa); + for (; l; l=BM_iter_step(&liter)) { + BM_elem_flag_set(l->v, BM_ELEM_TAG); } } } @@ -2094,10 +2094,10 @@ static void createTransEditVerts(bContext *C, TransInfo *t) * get_crazy_mapped_editverts messes up the index state of the * verts*/ selstate = MEM_callocN(sizeof(*selstate) * bm->totvert, __func__); - eve = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL); - for(a=0; eve; eve=BMIter_Step(&iter), a++) { - if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { - if (BM_TestHFlag(eve, BM_ELEM_TAG)) { + eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); + for(a=0; eve; eve=BM_iter_step(&iter), a++) { + if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { + if (BM_elem_flag_test(eve, BM_ELEM_TAG)) { selstate[a] = 1; countsel++; } @@ -2162,9 +2162,9 @@ static void createTransEditVerts(bContext *C, TransInfo *t) /* find out which half we do */ if(mirror) { - eve = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL); - for(a=0; eve; eve=BMIter_Step(&iter), a++) { - if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && selstate[a] && eve->co[0]!=0.0f) { + eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); + for(a=0; eve; eve=BM_iter_step(&iter), a++) { + if(!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && selstate[a] && eve->co[0]!=0.0f) { if(eve->co[0]<0.0f) { t->mirror = -1; @@ -2175,9 +2175,9 @@ static void createTransEditVerts(bContext *C, TransInfo *t) } } - eve = BMIter_New(&iter, bm, BM_VERTS_OF_MESH, NULL); - for(a=0; eve; eve=BMIter_Step(&iter), a++) { - if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL); + for(a=0; eve; eve=BM_iter_step(&iter), a++) { + if(!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { if(propmode || selstate[a]) { float *bweight = CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_BWEIGHT); @@ -2199,12 +2199,12 @@ static void createTransEditVerts(bContext *C, TransInfo *t) } /* CrazySpace */ - if(defmats || (quats && BM_GetIndex(eve) != -1)) { + if(defmats || (quats && BM_elem_index_get(eve) != -1)) { float mat[3][3], qmat[3][3], imat[3][3]; /* use both or either quat and defmat correction */ - if(quats && BM_GetIndex(eve) != -1) { - quat_to_mat3(qmat, quats + 4*BM_GetIndex(eve)); + if(quats && BM_elem_index_get(eve) != -1) { + quat_to_mat3(qmat, quats + 4*BM_elem_index_get(eve)); if(defmats) mul_serie_m3(mat, mtx, qmat, defmats[a], @@ -2457,11 +2457,11 @@ static void createTransUVs(bContext *C, TransInfo *t) tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if(!uvedit_face_visible(scene, ima, efa, tf)) { - BM_ClearHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_clear(efa, BM_ELEM_TAG); continue; } - BM_SetHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_set(efa, BM_ELEM_TAG); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { if (uvedit_uv_selected(em, scene, l)) countsel++; @@ -2487,7 +2487,7 @@ static void createTransUVs(bContext *C, TransInfo *t) td2d= t->data2d; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 6211cff55b7..f95856b2373 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -320,8 +320,8 @@ int calc_manipulator_stats(const bContext *C) it is not flush down on changes */ if(ts->selectmode & SCE_SELECT_VERTEX) { BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { - if(BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if(!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { + if(BM_elem_flag_test(eve, BM_ELEM_SELECT)) { totsel++; calc_tw_center(scene, eve->co); } @@ -332,10 +332,10 @@ int calc_manipulator_stats(const bContext *C) BMIter itersub; BMEdge *eed; BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if(!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { /* check the vertex has a selected edge, only add it once */ BM_ITER(eed, &itersub, bm, BM_EDGES_OF_VERT, eve) { - if(BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) { totsel++; calc_tw_center(scene, eve->co); break; @@ -348,10 +348,10 @@ int calc_manipulator_stats(const bContext *C) BMIter itersub; BMFace *efa; BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) { - if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { + if(!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { /* check the vertex has a selected face, only add it once */ BM_ITER(efa, &itersub, bm, BM_FACES_OF_VERT, eve) { - if(BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(efa, BM_ELEM_SELECT)) { totsel++; calc_tw_center(scene, eve->co); break; diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index f3bdf0b7d1a..5d92ada60e3 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -617,7 +617,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMIter iter; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(efa, BM_ELEM_SELECT)) { add_v3_v3(normal, efa->no); sub_v3_v3v3(vec, ((BMLoopList*)efa->loops.first)->first->v->co, @@ -635,7 +635,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], float cotangent[3]; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if (v1 == NULL) { v1 = eve; } @@ -660,7 +660,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMIter iter; BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if(BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) { sub_v3_v3v3(plane, eed->v2->co, eed->v1->co); break; } @@ -675,7 +675,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMIter iter; BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if(BM_TestHFlag(eed, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(eed, BM_ELEM_SELECT)) { /* use average vert normals as plane and edge vector as normal */ copy_v3_v3(plane, eed->v1->no); add_v3_v3(plane, eed->v2->no); @@ -691,7 +691,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMIter iter; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { if (v1 == NULL) { v1 = eve; } @@ -712,7 +712,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], BMIter iter; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { copy_v3_v3(normal, eve->no); break; } @@ -725,7 +725,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], normal[0] = normal[1] = normal[2] = 0.0f; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (BM_TestHFlag(eve, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) { add_v3_v3(normal, eve->no); } } diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 7de00e024f6..183ade56cf0 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1464,16 +1464,16 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh { efa = EDBM_get_face_for_index(em, index); - if (efa && BM_TestHFlag(efa, BM_ELEM_HIDDEN)) + if (efa && BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { test = 0; } else if (efa) { BMIter iter; BMLoop *l; - l = BMIter_New(&iter, em->bm, BM_LOOPS_OF_FACE, efa); - for ( ; l; l=BMIter_Step(&iter)) { - if (BM_TestHFlag(l->v, BM_ELEM_SELECT)) { + l = BM_iter_new(&iter, em->bm, BM_LOOPS_OF_FACE, efa); + for ( ; l; l=BM_iter_step(&iter)) { + if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)) { test = 0; break; } @@ -1548,7 +1548,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh { eve = EDBM_get_vert_for_index(em, index); - if (eve && (BM_TestHFlag(eve, BM_ELEM_HIDDEN) || BM_TestHFlag(eve, BM_ELEM_SELECT))) + if (eve && (BM_elem_flag_test(eve, BM_ELEM_HIDDEN) || BM_elem_flag_test(eve, BM_ELEM_SELECT))) { test = 0; } @@ -1608,9 +1608,9 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh { eed = EDBM_get_edge_for_index(em, index); - if (eed && (BM_TestHFlag(eed, BM_ELEM_HIDDEN) || - BM_TestHFlag(eed->v1, BM_ELEM_SELECT) || - BM_TestHFlag(eed->v2, BM_ELEM_SELECT))) + if (eed && (BM_elem_flag_test(eed, BM_ELEM_HIDDEN) || + BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || + BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))) { test = 0; } diff --git a/source/blender/editors/util/crazyspace.c b/source/blender/editors/util/crazyspace.c index c88f6e0d60b..c611a14ae7f 100644 --- a/source/blender/editors/util/crazyspace.c +++ b/source/blender/editors/util/crazyspace.c @@ -146,28 +146,28 @@ void crazyspace_set_quats_editmesh(BMEditMesh *em, float *origcos, float *mapped int *vert_table = MEM_callocN(sizeof(int)*em->bm->totvert, "vert_table"); int index = 0; - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - if (!BM_TestHFlag(v, BM_ELEM_SELECT) || BM_TestHFlag(v, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(v, BM_ELEM_SELECT) || BM_elem_flag_test(v, BM_ELEM_HIDDEN)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_VERT, v) { - BMLoop *l2 = BM_OtherFaceLoop(l->e, l->f, v); + BMLoop *l2 = BM_face_other_loop(l->e, l->f, v); /* retrieve mapped coordinates */ - v1= mappedcos + 3*BM_GetIndex(l->v); - v2= mappedcos + 3*BM_GetIndex(BM_OtherEdgeVert(l2->e, l->v)); - v3= mappedcos + 3*BM_GetIndex(BM_OtherEdgeVert(l->e, l->v)); + v1= mappedcos + 3*BM_elem_index_get(l->v); + v2= mappedcos + 3*BM_elem_index_get(BM_edge_other_vert(l2->e, l->v)); + v3= mappedcos + 3*BM_elem_index_get(BM_edge_other_vert(l->e, l->v)); - co1= (origcos)? origcos + 3*BM_GetIndex(l->v) : l->v->co; - co2= (origcos)? origcos + 3*BM_GetIndex(BM_OtherEdgeVert(l2->e, l->v)) : BM_OtherEdgeVert(l2->e, l->v)->co; - co3= (origcos)? origcos + 3*BM_GetIndex(BM_OtherEdgeVert(l->e, l->v)) : BM_OtherEdgeVert(l->e, l->v)->co; + co1= (origcos)? origcos + 3*BM_elem_index_get(l->v) : l->v->co; + co2= (origcos)? origcos + 3*BM_elem_index_get(BM_edge_other_vert(l2->e, l->v)) : BM_edge_other_vert(l2->e, l->v)->co; + co3= (origcos)? origcos + 3*BM_elem_index_get(BM_edge_other_vert(l->e, l->v)) : BM_edge_other_vert(l->e, l->v)->co; set_crazy_vertex_quat(quats, v1, v2, v3, co1, co2, co3); quats+= 4; - vert_table[BM_GetIndex(l->v)] = index+1; + vert_table[BM_elem_index_get(l->v)] = index+1; index++; break; /*just do one corner*/ @@ -177,9 +177,9 @@ void crazyspace_set_quats_editmesh(BMEditMesh *em, float *origcos, float *mapped index = 0; BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { if (vert_table[index] != 0) - BM_SetIndex(v, vert_table[index]-1); /* set_dirty! */ + BM_elem_index_set(v, vert_table[index]-1); /* set_dirty! */ else - BM_SetIndex(v, -1); /* set_dirty! */ + BM_elem_index_set(v, -1); /* set_dirty! */ index++; } diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 8693e3e7d6d..26fbc48d2fb 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -201,17 +201,17 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len); - totarea += BM_Compute_Face_Area(em->bm, efa); + totarea += BM_face_area_calc(em->bm, efa); //totuvarea += tf_area(tf, efa->v4!=0); totuvarea += poly_uv_area(tf_uv, efa->len); if(uvedit_face_visible(scene, ima, efa, tf)) { - BM_SetHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_set(efa, BM_ELEM_TAG); } else { if(tf == activetf) activetf= NULL; - BM_ClearHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_clear(efa, BM_ELEM_TAG); } } @@ -220,7 +220,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe col[1] = col[2] = 0.0; glColor3fv(col); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_TestHFlag(efa, BM_ELEM_TAG)) { + if(BM_elem_flag_test(efa, BM_ELEM_TAG)) { glBegin(GL_POLYGON); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -232,8 +232,8 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_TestHFlag(efa, BM_ELEM_TAG)) { - area = BM_Compute_Face_Area(em->bm, efa) / totarea; + if(BM_elem_flag_test(efa, BM_ELEM_TAG)) { + area = BM_face_area_calc(em->bm, efa) / totarea; BLI_array_empty(tf_uv); BLI_array_empty(tf_uvorig); @@ -518,7 +518,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) em= me->edit_btmesh; activetf= EDBM_get_active_mtexpoly(em, &efa_act, FALSE); /* will be set to NULL if hidden */ - activef = BM_get_actFace(em->bm, FALSE); + activef = BM_active_face_get(em->bm, FALSE); ts= scene->toolsettings; drawfaces= draw_uvs_face_check(scene); @@ -569,7 +569,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if(uvedit_face_visible(scene, ima, efa, tf)) { - BM_SetHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_set(efa, BM_ELEM_TAG); if(tf==activetf) continue; /* important the temp boolean is set above */ if(uvedit_face_selected(scene, em, efa)) @@ -587,7 +587,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) else { if(tf == activetf) activetf= NULL; - BM_ClearHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_clear(efa, BM_ELEM_TAG); } } glDisable(GL_BLEND); @@ -599,12 +599,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if(uvedit_face_visible(scene, ima, efa, tf)) { - BM_SetHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_set(efa, BM_ELEM_TAG); } else { if(tf == activetf) activetf= NULL; - BM_ClearHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_clear(efa, BM_ELEM_TAG); } } @@ -642,7 +642,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) switch(sima->dt_uv) { case SI_UVDT_DASH: BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -683,7 +683,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) else glColor3f(0.0f, 0.0f, 0.0f); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -699,7 +699,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) cpack(0x0); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -722,7 +722,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) glShadeModel(GL_SMOOTH); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -740,7 +740,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINES); @@ -762,7 +762,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) else { /* no nice edges */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; glBegin(GL_LINE_LOOP); @@ -795,7 +795,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; if(!uvedit_face_selected(scene, em, efa)) { @@ -810,7 +810,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; if(uvedit_face_selected(scene, em, efa)) { @@ -831,7 +831,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -849,7 +849,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -867,7 +867,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit) bglBegin(GL_POINTS); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 6d0468d34f5..42b6953a719 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -188,7 +188,7 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im if(scene_use_new_shading_nodes(scene)) { /* new shading system, assign image in material */ int sloppy= 1; - BMFace *efa= BM_get_actFace(em->bm, sloppy); + BMFace *efa= BM_active_face_get(em->bm, sloppy); if(efa) ED_object_assign_active_image(bmain, obedit, efa->mat_nr, ima); @@ -198,8 +198,8 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im /* ensure we have a uv map */ if(!CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY)) { - BM_add_data_layer(em->bm, &em->bm->pdata, CD_MTEXPOLY); - BM_add_data_layer(em->bm, &em->bm->ldata, CD_MLOOPUV); + BM_data_layer_add(em->bm, &em->bm->pdata, CD_MTEXPOLY); + BM_data_layer_add(em->bm, &em->bm->ldata, CD_MLOOPUV); update= 1; } @@ -254,7 +254,7 @@ static int uvedit_set_tile(Object *obedit, Image *ima, int curtile) BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - if(!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && BM_TestHFlag(efa, BM_ELEM_SELECT)) + if(!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT)) tf->tile= curtile; /* set tile index */ } @@ -288,9 +288,9 @@ int uvedit_face_visible_nolocal(Scene *scene, BMFace *efa) ToolSettings *ts= scene->toolsettings; if(ts->uv_flag & UV_SYNC_SELECTION) - return (BM_TestHFlag(efa, BM_ELEM_HIDDEN)==0); + return (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)==0); else - return (BM_TestHFlag(efa, BM_ELEM_HIDDEN)==0 && BM_TestHFlag(efa, BM_ELEM_SELECT)); + return (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)==0 && BM_elem_flag_test(efa, BM_ELEM_SELECT)); } int uvedit_face_visible(Scene *scene, Image *ima, BMFace *efa, MTexPoly *tf) { @@ -307,7 +307,7 @@ int uvedit_face_selected(Scene *scene, BMEditMesh *em, BMFace *efa) ToolSettings *ts= scene->toolsettings; if(ts->uv_flag & UV_SYNC_SELECTION) - return (BM_TestHFlag(efa, BM_ELEM_SELECT)); + return (BM_elem_flag_test(efa, BM_ELEM_SELECT)); else { BMLoop *l; MLoopUV *luv; @@ -328,7 +328,7 @@ int uvedit_face_select(Scene *scene, BMEditMesh *em, BMFace *efa) ToolSettings *ts= scene->toolsettings; if(ts->uv_flag & UV_SYNC_SELECTION) - BM_Select(em->bm, efa, TRUE); + BM_elem_select_set(em->bm, efa, TRUE); else { BMLoop *l; MLoopUV *luv; @@ -350,7 +350,7 @@ int uvedit_face_deselect(Scene *scene, BMEditMesh *em, BMFace *efa) ToolSettings *ts= scene->toolsettings; if(ts->uv_flag & UV_SYNC_SELECTION) { - BM_Select(em->bm, efa, FALSE); + BM_elem_select_set(em->bm, efa, FALSE); } else { BMLoop *l; @@ -374,12 +374,12 @@ int uvedit_edge_selected(BMEditMesh *em, Scene *scene, BMLoop *l) if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode & SCE_SELECT_FACE) - return BM_TestHFlag(l->f, BM_ELEM_SELECT); + return BM_elem_flag_test(l->f, BM_ELEM_SELECT); else if(ts->selectmode == SCE_SELECT_EDGE) { - return BM_TestHFlag(l->e, BM_ELEM_SELECT); + return BM_elem_flag_test(l->e, BM_ELEM_SELECT); } else - return BM_TestHFlag(l->v, BM_ELEM_SELECT) && - BM_TestHFlag(l->next->v, BM_ELEM_SELECT); + return BM_elem_flag_test(l->v, BM_ELEM_SELECT) && + BM_elem_flag_test(l->next->v, BM_ELEM_SELECT); } else { MLoopUV *luv1, *luv2; @@ -398,12 +398,12 @@ void uvedit_edge_select(BMEditMesh *em, Scene *scene, BMLoop *l) if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode & SCE_SELECT_FACE) - BM_Select(em->bm, l->f, TRUE); + BM_elem_select_set(em->bm, l->f, TRUE); else if(ts->selectmode & SCE_SELECT_EDGE) - BM_Select(em->bm, l->e, TRUE); + BM_elem_select_set(em->bm, l->e, TRUE); else { - BM_Select(em->bm, l->e->v1, TRUE); - BM_Select(em->bm, l->e->v2, TRUE); + BM_elem_select_set(em->bm, l->e->v1, TRUE); + BM_elem_select_set(em->bm, l->e->v2, TRUE); } } else { @@ -424,12 +424,12 @@ void uvedit_edge_deselect(BMEditMesh *em, Scene *scene, BMLoop *l) if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode & SCE_SELECT_FACE) - BM_Select(em->bm, l->f, FALSE); + BM_elem_select_set(em->bm, l->f, FALSE); else if(ts->selectmode & SCE_SELECT_EDGE) - BM_Select(em->bm, l->e, FALSE); + BM_elem_select_set(em->bm, l->e, FALSE); else { - BM_Select(em->bm, l->e->v1, FALSE); - BM_Select(em->bm, l->e->v2, FALSE); + BM_elem_select_set(em->bm, l->e->v1, FALSE); + BM_elem_select_set(em->bm, l->e->v2, FALSE); } } else { @@ -449,9 +449,9 @@ int uvedit_uv_selected(BMEditMesh *em, Scene *scene, BMLoop *l) if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode & SCE_SELECT_FACE) - return BM_TestHFlag(l->f, BM_ELEM_SELECT); + return BM_elem_flag_test(l->f, BM_ELEM_SELECT); else - return BM_TestHFlag(l->v, BM_ELEM_SELECT); + return BM_elem_flag_test(l->v, BM_ELEM_SELECT); } else { MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -466,9 +466,9 @@ void uvedit_uv_select(BMEditMesh *em, Scene *scene, BMLoop *l) if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode & SCE_SELECT_FACE) - BM_Select(em->bm, l->f, TRUE); + BM_elem_select_set(em->bm, l->f, TRUE); else - BM_Select(em->bm, l->v, TRUE); + BM_elem_select_set(em->bm, l->v, TRUE); } else { MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -483,9 +483,9 @@ void uvedit_uv_deselect(BMEditMesh *em, Scene *scene, BMLoop *l) if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode & SCE_SELECT_FACE) - BM_Select(em->bm, l->f, FALSE); + BM_elem_select_set(em->bm, l->f, FALSE); else - BM_Select(em->bm, l->v, FALSE); + BM_elem_select_set(em->bm, l->v, FALSE); } else { MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -682,7 +682,7 @@ void uv_find_nearest_edge(Scene *scene, Image *ima, BMEditMesh *em, float co[2], mindist= 1e10f; memset(hit, 0, sizeof(*hit)); - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -705,8 +705,8 @@ void uv_find_nearest_edge(Scene *scene, Image *ima, BMEditMesh *em, float co[2], hit->luv = luv; hit->nextluv = nextluv; hit->lindex = i; - hit->vert1 = BM_GetIndex(hit->l->v); - hit->vert2 = BM_GetIndex(hit->l->next->v); + hit->vert1 = BM_elem_index_get(hit->l->v); + hit->vert2 = BM_elem_index_get(hit->l->next->v); mindist = dist; } @@ -822,7 +822,7 @@ void uv_find_nearest_vert(Scene *scene, Image *ima, BMEditMesh *em, mindist= 1e10f; memset(hit, 0, sizeof(*hit)); - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -854,7 +854,7 @@ void uv_find_nearest_vert(Scene *scene, Image *ima, BMEditMesh *em, hit->tf= tf; hit->efa= efa; hit->lindex = i; - hit->vert1 = BM_GetIndex(hit->l->v); + hit->vert1 = BM_elem_index_get(hit->l->v); } i++; @@ -922,13 +922,13 @@ static UvMapVert *uv_vertex_map_get(UvVertMap *vmap, BMFace *efa, int a) UvMapVert *iterv, *first; BMLoop *l; - l = BMIter_AtIndex(NULL, BM_LOOPS_OF_FACE, efa, a); - first= EDBM_get_uv_map_vert(vmap, BM_GetIndex(l->v)); + l = BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, a); + first= EDBM_get_uv_map_vert(vmap, BM_elem_index_get(l->v)); for(iterv=first; iterv; iterv=iterv->next) { if(iterv->separate) first= iterv; - if(iterv->f == BM_GetIndex(efa)) + if(iterv->f == BM_elem_index_get(efa)) return first; } @@ -942,9 +942,9 @@ UvElement *ED_get_uv_element(UvElementMap *map, BMFace *efa, int index) BMLoop *l; UvElement *element; - l = BMIter_AtIndex(NULL, BM_LOOPS_OF_FACE, efa, index); + l = BM_iter_at_index(NULL, BM_LOOPS_OF_FACE, efa, index); - element = map->vert[BM_GetIndex(l->v)]; + element = map->vert[BM_elem_index_get(l->v)]; for(; element; element = element->next) if(element->face == efa) @@ -971,7 +971,7 @@ static int uv_edge_tag_faces(BMEditMesh *em, UvMapVert *first1, UvMapVert *first if(iterv1->f == iterv2->f) { /* if face already tagged, don't do this edge */ efa= EDBM_get_face_for_index(em, iterv1->f); - if(BMO_TestFlag(em->bm, efa, EFA_F1_FLAG)) + if(BMO_elem_flag_test(em->bm, efa, EFA_F1_FLAG)) return 0; tot++; @@ -996,7 +996,7 @@ static int uv_edge_tag_faces(BMEditMesh *em, UvMapVert *first1, UvMapVert *first if(iterv1->f == iterv2->f) { efa= EDBM_get_face_for_index(em, iterv1->f); - BMO_SetFlag(em->bm, efa, EFA_F1_FLAG); + BMO_elem_flag_set(em->bm, efa, EFA_F1_FLAG); break; } } @@ -1019,7 +1019,7 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit EDBM_init_index_arrays(em, 0, 0, 1); vmap= EDBM_make_uv_vert_map(em, 0, 0, limit); - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); count = 0; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { @@ -1027,9 +1027,9 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit uvedit_face_deselect(scene, em, efa); } - BMO_ClearFlag(em->bm, efa, EFA_F1_FLAG); + BMO_elem_flag_clear(em->bm, efa, EFA_F1_FLAG); - BM_SetIndex(efa, count); /* set_inline */ + BM_elem_index_set(efa, count); /* set_inline */ count++; } @@ -1058,7 +1058,7 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - if(!BMO_TestFlag(em->bm, efa, EFA_F1_FLAG) && uvedit_face_visible(scene, ima, efa, tf)) { + if(!BMO_elem_flag_test(em->bm, efa, EFA_F1_FLAG) && uvedit_face_visible(scene, ima, efa, tf)) { nverts= efa->len; for(a=0; a<nverts; a++) { /* check face not hidden and not tagged */ @@ -1072,7 +1072,7 @@ static int select_edgeloop(Scene *scene, Image *ima, BMEditMesh *em, NearestHit if(iterv1->flag || iterv2->flag) { if(uv_edge_tag_faces(em, iterv1, iterv2, &starttotf)) { looking= 1; - BMO_SetFlag(em->bm, efa, EFA_F1_FLAG); + BMO_elem_flag_set(em->bm, efa, EFA_F1_FLAG); uv_vertex_loop_flag(iterv1); uv_vertex_loop_flag(iterv2); @@ -1202,7 +1202,7 @@ static void select_linked(Scene *scene, Image *ima, BMEditMesh *em, float limit[ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { /* make_uv_vert_map_EM sets verts tmp.l to the indices */ - vlist= EDBM_get_uv_map_vert(vmap, BM_GetIndex(l->v)); + vlist= EDBM_get_uv_map_vert(vmap, BM_elem_index_get(l->v)); startv= vlist; @@ -1418,7 +1418,7 @@ static void weld_align_uv(bContext *C, int tool) /* clear tag */ BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - BM_ClearHFlag(eve, BM_ELEM_TAG); + BM_elem_flag_clear(eve, BM_ELEM_TAG); } /* tag verts with a selected UV */ @@ -1430,7 +1430,7 @@ static void weld_align_uv(bContext *C, int tool) continue; if (uvedit_uv_selected(em, scene, l)) { - BM_SetHFlag(eve, BM_ELEM_TAG); + BM_elem_flag_set(eve, BM_ELEM_TAG); break; } } @@ -1438,11 +1438,11 @@ static void weld_align_uv(bContext *C, int tool) /* flush vertex tags to edges */ BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if (BM_TestHFlag(eed->v1, BM_ELEM_TAG) && BM_TestHFlag(eed->v2, BM_ELEM_TAG)) { - BM_SetHFlag(eed, BM_ELEM_TAG); + if (BM_elem_flag_test(eed->v1, BM_ELEM_TAG) && BM_elem_flag_test(eed->v2, BM_ELEM_TAG)) { + BM_elem_flag_set(eed, BM_ELEM_TAG); } else { - BM_ClearHFlag(eed, BM_ELEM_TAG); + BM_elem_flag_clear(eed, BM_ELEM_TAG); } } @@ -1451,7 +1451,7 @@ static void weld_align_uv(bContext *C, int tool) BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { int tot_eed_tag = 0; BM_ITER(eed, &eiter, em->bm, BM_EDGES_OF_VERT, eve) { - if (BM_TestHFlag(eed, BM_ELEM_TAG)) { + if (BM_elem_flag_test(eed, BM_ELEM_TAG)) { tot_eed_tag++; } } @@ -1474,15 +1474,15 @@ static void weld_align_uv(bContext *C, int tool) while (eve) { BLI_array_append(eve_line, eve); /* dont touch again */ - BM_ClearHFlag(eve, BM_ELEM_TAG); + BM_elem_flag_clear(eve, BM_ELEM_TAG); eve_next = NULL; /* find next eve */ BM_ITER(eed, &eiter, em->bm, BM_EDGES_OF_VERT, eve) { - if (BM_TestHFlag(eed, BM_ELEM_TAG)) { - BMVert *eve_other = BM_OtherEdgeVert(eed, eve); - if (BM_TestHFlag(eve_other, BM_ELEM_TAG)) { + if (BM_elem_flag_test(eed, BM_ELEM_TAG)) { + BMVert *eve_other = BM_edge_other_vert(eed, eve); + if (BM_elem_flag_test(eve_other, BM_ELEM_TAG)) { /* this is a tagged vert we didnt walk over yet, step onto it */ eve_next = eve_other; break; @@ -1655,7 +1655,7 @@ static int stitch_exec(bContext *C, wmOperator *op) efa = EDBM_get_face_for_index(em, iterv->f); tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -1675,7 +1675,7 @@ static int stitch_exec(bContext *C, wmOperator *op) efa = EDBM_get_face_for_index(em, iterv->f); tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - l = BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); + l = BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa, iterv->tfindex); if (uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -1698,7 +1698,7 @@ static int stitch_exec(bContext *C, wmOperator *op) else { UVVertAverage *uv_average, *uvav; - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); uv_average= MEM_callocN(sizeof(UVVertAverage)*em->bm->totvert, "Stitch"); @@ -1711,7 +1711,7 @@ static int stitch_exec(bContext *C, wmOperator *op) BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { if(uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - uvav = uv_average + BM_GetIndex(l->v); + uvav = uv_average + BM_elem_index_get(l->v); uvav->count++; uvav->uv[0] += luv->uv[0]; @@ -1729,7 +1729,7 @@ static int stitch_exec(bContext *C, wmOperator *op) BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { if(uvedit_uv_selected(em, scene, l)) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - uvav = uv_average + BM_GetIndex(l->v); + uvav = uv_average + BM_elem_index_get(l->v); luv->uv[0] = uvav->uv[0]/uvav->count; luv->uv[1] = uvav->uv[1]/uvav->count; } @@ -2018,7 +2018,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) } /* make active */ - BM_set_actFace(em->bm, hit.efa); + BM_active_face_set(em->bm, hit.efa); /* mark all face vertices as being hit */ @@ -2028,7 +2028,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, hit.efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); hituv[i]= luv->uv; - hitv[i] = BM_GetIndex(l->v); + hitv[i] = BM_elem_index_get(l->v); i++; } @@ -2100,7 +2100,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) /* (de)select sticky uv nodes */ if(sticky != SI_STICKY_DISABLE) { - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); /* deselect */ if(select==0) { @@ -2111,7 +2111,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - if(sticky_select(limit, hitv, BM_GetIndex(l->v), hituv, luv->uv, sticky, hitlen)) + if(sticky_select(limit, hitv, BM_elem_index_get(l->v), hituv, luv->uv, sticky, hitlen)) uvedit_uv_deselect(em, scene, l); } } @@ -2126,7 +2126,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - if(sticky_select(limit, hitv, BM_GetIndex(l->v), hituv, luv->uv, sticky, hitlen)) + if(sticky_select(limit, hitv, BM_elem_index_get(l->v), hituv, luv->uv, sticky, hitlen)) uvedit_uv_select(em, scene, l); } } @@ -2167,7 +2167,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) if(sticky == SI_STICKY_DISABLE) continue; luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - if(sticky_select(limit, hitv, BM_GetIndex(l->v), hituv, luv->uv, sticky, hitlen)) + if(sticky_select(limit, hitv, BM_elem_index_get(l->v), hituv, luv->uv, sticky, hitlen)) uvedit_uv_select(em, scene, l); flush= 1; @@ -2176,7 +2176,7 @@ static int mouse_select(bContext *C, float co[2], int extend, int loop) } } -#if 0 /* BM_Select API handles all of this? */ +#if 0 /* BM_elem_select_set API handles all of this? */ if(sync) { /* flush for mesh selection */ @@ -2481,13 +2481,13 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje BMVert *eve; BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - BM_ClearHFlag(eve, BM_ELEM_TAG); + BM_elem_flag_clear(eve, BM_ELEM_TAG); } BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(efa, BM_ELEM_TAG)) { + if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - BM_SetHFlag(l->v, BM_ELEM_TAG); + BM_elem_flag_set(l->v, BM_ELEM_TAG); } } } @@ -2497,7 +2497,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - if (BM_TestHFlag(l->v, BM_ELEM_TAG)) { + if (BM_elem_flag_test(l->v, BM_ELEM_TAG)) { if (select) uvedit_uv_select(em, scene, l); else @@ -2529,9 +2529,9 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje return; } - efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); - for (efa_index=0; efa; efa=BMIter_Step(&iter), efa_index++) { - if (BM_TestHFlag(efa, BM_ELEM_TAG)) { + efa = BM_iter_new(&iter, em->bm, BM_FACES_OF_MESH, NULL); + for (efa_index=0; efa; efa=BM_iter_step(&iter), efa_index++) { + if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -2540,7 +2540,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje else uvedit_uv_deselect(em, scene, l); - vlist_iter= EDBM_get_uv_map_vert(vmap, BM_GetIndex(l->v)); + vlist_iter= EDBM_get_uv_map_vert(vmap, BM_elem_index_get(l->v)); while (vlist_iter) { if(vlist_iter->separate) @@ -2563,9 +2563,9 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje /* tf_vlist = CustomData_bmesh_get(&em->bm->pdata, efa_vlist->head.data, CD_MTEXPOLY); */ /* UNUSED */ if(select) - uvedit_uv_select(em, scene, BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa_vlist, vlist_iter->tfindex)); + uvedit_uv_select(em, scene, BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa_vlist, vlist_iter->tfindex)); else - uvedit_uv_deselect(em, scene, BMIter_AtIndex(em->bm, BM_LOOPS_OF_FACE, efa_vlist, vlist_iter->tfindex)); + uvedit_uv_deselect(em, scene, BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa_vlist, vlist_iter->tfindex)); } vlist_iter = vlist_iter->next; } @@ -2578,7 +2578,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje } else { /* SI_STICKY_DISABLE or ts->uv_flag & UV_SYNC_SELECTION */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (BM_TestHFlag(efa, BM_ELEM_TAG)) { + if (BM_elem_flag_test(efa, BM_ELEM_TAG)) { if(select) uvedit_face_select(scene, em, efa); else @@ -2637,13 +2637,13 @@ static int border_select_exec(bContext *C, wmOperator *op) BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { /* assume not touched */ - BM_ClearHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_clear(efa, BM_ELEM_TAG); tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if(uvedit_face_visible(scene, ima, efa, tf)) { poly_uv_center(em, efa, cent); if(BLI_in_rctf(&rectf, cent[0], cent[1])) { - BM_SetHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_set(efa, BM_ELEM_TAG); change = 1; } } @@ -2684,7 +2684,7 @@ static int border_select_exec(bContext *C, wmOperator *op) if(change) { /* make sure newly selected vert selection is updated*/ -#if 0 /* BM_Select API handles all of this? */ +#if 0 /* BM_elem_select_set API handles all of this? */ if(ts->uv_flag & UV_SYNC_SELECTION) { if(ts->selectmode != SCE_SELECT_FACE) { if(select) EDBM_select_flush(em); @@ -2784,7 +2784,7 @@ static int circle_select_exec(bContext *C, wmOperator *op) } } -#if 0 //I think the BM_Select api stuff handles all this as necassary? +#if 0 //I think the BM_elem_select_set api stuff handles all this as necassary? if(select) EM_select_flush(em); else EM_deselect_flush(em); #endif @@ -2934,7 +2934,7 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe /* set all verts to -1 : an unused index*/ BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) - BM_SetIndex(eve, -1); /* set_dirty! */ + BM_elem_index_set(eve, -1); /* set_dirty! */ em->bm->elem_index_dirty |= BM_VERT; /* index every vert that has a selected UV using it, but only once so as to @@ -2942,16 +2942,16 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tface= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); if(!uvedit_face_visible(scene, ima, efa, tface)) { - BM_ClearHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_clear(efa, BM_ELEM_TAG); continue; } else { - BM_SetHFlag(efa, BM_ELEM_TAG); + BM_elem_flag_set(efa, BM_ELEM_TAG); } change = 1; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - if (uvedit_uv_selected(em, scene, l) && BM_GetIndex(l->v) == -1) { - BM_SetIndex(l->v, count); /* set_dirty! */ + if (uvedit_uv_selected(em, scene, l) && BM_elem_index_get(l->v) == -1) { + BM_elem_index_set(l->v, count); /* set_dirty! */ count++; } } @@ -2963,7 +2963,7 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe /* add all UV coords from visible, unselected UV coords as well as counting them to average later */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; tface= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -2971,10 +2971,10 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - if (BM_GetIndex(l->v) >= 0 && + if (BM_elem_index_get(l->v) >= 0 && (!uvedit_uv_selected(em, scene, l))) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - add_v2_v2(&coords[BM_GetIndex(l->v) * 2], luv->uv); + add_v2_v2(&coords[BM_elem_index_get(l->v) * 2], luv->uv); change = 1; } } @@ -2989,7 +2989,7 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe /* copy the averaged unselected UVs back to the selected UVs */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_TAG)) + if (!BM_elem_flag_test(efa, BM_ELEM_TAG)) continue; tface= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -2997,10 +2997,10 @@ static int snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obe continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - if (uvedit_uv_selected(em, scene, l) && BM_GetIndex(l->v) >= 0 - && (users = usercount[BM_GetIndex(l->v)])) { + if (uvedit_uv_selected(em, scene, l) && BM_elem_index_get(l->v) >= 0 + && (users = usercount[BM_elem_index_get(l->v)])) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); - copy_v2_v2(luv->uv, &coords[BM_GetIndex(l->v) * 2]); + copy_v2_v2(luv->uv, &coords[BM_elem_index_get(l->v) * 2]); } } } @@ -3246,7 +3246,7 @@ static int hide_exec(bContext *C, wmOperator *op) } if (!luv) { - BM_Select(em->bm, efa, FALSE); + BM_elem_select_set(em->bm, efa, FALSE); uvedit_face_deselect(scene, em, efa); } } else if(em->selectmode == SCE_SELECT_FACE) { @@ -3254,7 +3254,7 @@ static int hide_exec(bContext *C, wmOperator *op) BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_VERTSEL) { - BM_Select(em->bm, efa, FALSE); + BM_elem_select_set(em->bm, efa, FALSE); } luv->flag &= ~MLOOPUV_VERTSEL; } @@ -3262,7 +3262,7 @@ static int hide_exec(bContext *C, wmOperator *op) BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); if (luv->flag & MLOOPUV_VERTSEL) { - BM_Select(em->bm, l->v, FALSE); + BM_elem_select_set(em->bm, l->v, FALSE); luv->flag &= ~MLOOPUV_VERTSEL; } } @@ -3319,8 +3319,8 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) if(facemode) { if(em->selectmode == SCE_SELECT_FACE) { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && !BM_TestHFlag(efa, BM_ELEM_SELECT)) { - BM_Select(em->bm, efa, TRUE); + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { + BM_elem_select_set(em->bm, efa, TRUE); BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; @@ -3332,10 +3332,10 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) /* enable adjacent faces to have disconnected UV selections if sticky is disabled */ if(!stickymode) { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && !BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { int totsel=0; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - totsel += BM_TestHFlag(l->v, BM_ELEM_SELECT); + totsel += BM_elem_flag_test(l->v, BM_ELEM_SELECT); } if (!totsel) { @@ -3344,47 +3344,47 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) luv->flag |= MLOOPUV_VERTSEL; } - BM_Select(em->bm, efa, TRUE); + BM_elem_select_set(em->bm, efa, TRUE); } } } } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && !BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - if (BM_TestHFlag(l->v, BM_ELEM_SELECT)==0) { + if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)==0) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } } - BM_Select(em->bm, efa, TRUE); + BM_elem_select_set(em->bm, efa, TRUE); } } } } } else if(em->selectmode == SCE_SELECT_FACE) { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && !BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } - BM_Select(em->bm, efa, TRUE); + BM_elem_select_set(em->bm, efa, TRUE); } } } else { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && !BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && !BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { - if (BM_TestHFlag(l->v, BM_ELEM_SELECT)==0) { + if (BM_elem_flag_test(l->v, BM_ELEM_SELECT)==0) { luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); luv->flag |= MLOOPUV_VERTSEL; } } - BM_Select(em->bm, efa, TRUE); + BM_elem_select_set(em->bm, efa, TRUE); } } } @@ -3565,9 +3565,9 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op) * mv2sep holds the last separator and is copied to mv2cache when a hit is first found */ UvMapVert *mv2cache = NULL, *mv2sep = NULL; - mvinit1 = vmap->vert[BM_GetIndex(editedge->v1)]; + mvinit1 = vmap->vert[BM_elem_index_get(editedge->v1)]; if(mark_seams) - BM_ClearHFlag(editedge, BM_ELEM_SEAM); + BM_elem_flag_clear(editedge, BM_ELEM_SEAM); for(mv1 = mvinit1; mv1 && !faces_separated; mv1 = mv1->next) { if(mv1->separate && commonFaces) @@ -3575,7 +3575,7 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op) separated2 = 0; efa1 = EDBM_get_face_for_index(em, mv1->f); - mvinit2 = vmap->vert[BM_GetIndex(editedge->v2)]; + mvinit2 = vmap->vert[BM_elem_index_get(editedge->v2)]; for(mv2 = mvinit2; mv2; mv2 = mv2->next) { if(mv2->separate) @@ -3616,9 +3616,9 @@ static int seams_from_islands_exec(bContext *C, wmOperator *op) if(faces_separated) { if(mark_seams) - BM_SetHFlag(editedge, BM_ELEM_SEAM); + BM_elem_flag_set(editedge, BM_ELEM_SEAM); if(mark_sharp) - BM_SetHFlag(editedge, BM_ELEM_SHARP); + BM_elem_flag_set(editedge, BM_ELEM_SHARP); } } @@ -3667,7 +3667,7 @@ static int mark_seam_exec(bContext *C, wmOperator *UNUSED(op)) BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { BM_ITER(loop, &liter, bm, BM_LOOPS_OF_FACE, efa) { if(uvedit_edge_selected(em, scene, loop)) { - BM_SetHFlag(loop, BM_ELEM_SEAM); + BM_elem_flag_set(loop, BM_ELEM_SEAM); } } } diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 9427eb87920..fcb7d1d323d 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -104,8 +104,8 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit) } if(em && em->bm->totface && !CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY)) { - BM_add_data_layer(em->bm, &em->bm->pdata, CD_MTEXPOLY); - BM_add_data_layer(em->bm, &em->bm->ldata, CD_MLOOPUV); + BM_data_layer_add(em->bm, &em->bm->pdata, CD_MTEXPOLY); + BM_data_layer_add(em->bm, &em->bm->ldata, CD_MLOOPUV); } if(!ED_uvedit_test(obedit)) { @@ -158,10 +158,10 @@ static int uvedit_have_selection(Scene *scene, BMEditMesh *em, short implicit) so we can cancel the operator early */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { if(scene->toolsettings->uv_flag & UV_SYNC_SELECTION) { - if(BM_TestHFlag(efa, BM_ELEM_HIDDEN)) + if(BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; } - else if(BM_TestHFlag(efa, BM_ELEM_HIDDEN) || !BM_TestHFlag(efa, BM_ELEM_SELECT)) + else if(BM_elem_flag_test(efa, BM_ELEM_HIDDEN) || !BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -196,7 +196,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, handle = param_construct_begin(); if(correct_aspect) { - efa = BM_get_actFace(em->bm, TRUE); + efa = BM_active_face_get(em->bm, TRUE); if(efa) { float aspx, aspy; @@ -210,7 +210,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, } /* we need the vert indices */ - BM_ElemIndex_Ensure(em->bm, BM_VERT); + BM_mesh_elem_index_ensure(em->bm, BM_VERT); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { EditVert *v, *lastv, *firstv; @@ -223,7 +223,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, float *uv[4]; int lsel; - if((BM_TestHFlag(efa, BM_ELEM_HIDDEN)) || (sel && BM_TestHFlag(efa, BM_ELEM_SELECT)==0)) + if((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || (sel && BM_elem_flag_test(efa, BM_ELEM_SELECT)==0)) continue; /* tf= (MTexPoly *)CustomData_em_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ @@ -279,9 +279,9 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, luvs[1] = CustomData_bmesh_get(&em->bm->ldata, ls[1]->head.data, CD_MLOOPUV); luvs[2] = CustomData_bmesh_get(&em->bm->ldata, ls[2]->head.data, CD_MLOOPUV); - vkeys[0] = (ParamKey)BM_GetIndex(ls[0]->v); - vkeys[1] = (ParamKey)BM_GetIndex(ls[1]->v); - vkeys[2] = (ParamKey)BM_GetIndex(ls[2]->v); + vkeys[0] = (ParamKey)BM_elem_index_get(ls[0]->v); + vkeys[1] = (ParamKey)BM_elem_index_get(ls[1]->v); + vkeys[2] = (ParamKey)BM_elem_index_get(ls[2]->v); co[0] = ls[0]->v->co; co[1] = ls[1]->v->co; @@ -308,10 +308,10 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, if(!implicit) { BM_ITER(eed, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { - if(BM_TestHFlag(eed, BM_ELEM_SEAM)) { + if(BM_elem_flag_test(eed, BM_ELEM_SEAM)) { ParamKey vkeys[2]; - vkeys[0] = (ParamKey)BM_GetIndex(eed->v1); - vkeys[1] = (ParamKey)BM_GetIndex(eed->v2); + vkeys[0] = (ParamKey)BM_elem_index_get(eed->v1); + vkeys[1] = (ParamKey)BM_elem_index_get(eed->v2); param_edge_set_seam(handle, vkeys); } } @@ -890,7 +890,7 @@ static void uv_map_transform_center(Scene *scene, View3D *v3d, float *result, max[0]= max[1]= max[2]= -1e20f; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if(BM_TestHFlag(efa, BM_ELEM_SELECT)) { + if(BM_elem_flag_test(efa, BM_ELEM_SELECT)) { BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { DO_MINMAX(l->v->co, min, max); } @@ -1022,7 +1022,7 @@ static void uv_transform_properties(wmOperatorType *ot, int radius) static void correct_uv_aspect(BMEditMesh *em) { - BMFace *efa= BM_get_actFace(em->bm, TRUE); + BMFace *efa= BM_active_face_get(em->bm, TRUE); BMLoop *l; BMIter iter, liter; MTexPoly *tf; @@ -1042,7 +1042,7 @@ static void correct_uv_aspect(BMEditMesh *em) BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - if (!BM_TestHFlag(efa, BM_ELEM_SELECT) || BM_TestHFlag(efa, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT) || BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1056,7 +1056,7 @@ static void correct_uv_aspect(BMEditMesh *em) BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)||BM_TestHFlag(efa, BM_ELEM_HIDDEN)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)||BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1098,7 +1098,7 @@ static void uv_map_clip_correct(BMEditMesh *em, wmOperator *op) INIT_MINMAX2(min, max); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1117,7 +1117,7 @@ static void uv_map_clip_correct(BMEditMesh *em, wmOperator *op) dy= 1.0f/dy; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1131,7 +1131,7 @@ static void uv_map_clip_correct(BMEditMesh *em, wmOperator *op) else if(clip_to_bounds) { /* clipping and wrapping */ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1280,7 +1280,7 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) uv_map_rotation_matrix(rotmat, rv3d, obedit, 90.0f, 0.0f, 1.0f); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1294,7 +1294,7 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) if(uci) { BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1310,7 +1310,7 @@ static int uv_from_view_exec(bContext *C, wmOperator *op) copy_m4_m4(rotmat, obedit->obmat); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1457,7 +1457,7 @@ static int sphere_project_exec(bContext *C, wmOperator *op) uv_map_transform(C, op, center, rotmat); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1531,7 +1531,7 @@ static int cylinder_project_exec(bContext *C, wmOperator *op) BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -1597,7 +1597,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) int first=1; /* tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ - if (!BM_TestHFlag(efa, BM_ELEM_SELECT)) + if (!BM_elem_flag_test(efa, BM_ELEM_SELECT)) continue; axis_dominant_v3(&cox, &coy, efa->no); |