diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
6 files changed, 82 insertions, 82 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 211104e60f0..39f1552c8a6 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -564,7 +564,7 @@ static DMDrawOption draw_em_tf_mapped__set_draw(void *userData, int index) { drawEMTFMapped_userData *data = userData; BMEditMesh *em = data->em; - BMFace *efa = EDBM_get_face_for_index(em, index); + BMFace *efa = EDBM_face_at_index(em, index); if (efa == NULL || BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { return DM_DRAW_OPTION_SKIP; @@ -924,7 +924,7 @@ static int tex_mat_set_face_editmesh_cb(void *userData, int index) /* editmode face hiding */ TexMatCallback *data = (TexMatCallback *)userData; Mesh *me = (Mesh *)data->me; - BMFace *efa = EDBM_get_face_for_index(me->edit_btmesh, index); + BMFace *efa = EDBM_face_at_index(me->edit_btmesh, index); return !BM_elem_flag_test(efa, BM_ELEM_HIDDEN); } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 0332bd0bdb7..258debc8e60 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2021,7 +2021,7 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob) static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s)) { foreachScreenVert_userData *data = userData; - BMVert *eve = EDBM_get_vert_for_index(data->vc.em, index); + BMVert *eve = EDBM_vert_at_index(data->vc.em, index); if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { short s[2] = {IS_CLIPPED, 0}; @@ -2056,9 +2056,9 @@ void mesh_foreachScreenVert( if (clipVerts != V3D_CLIP_TEST_OFF) ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */ - EDBM_init_index_arrays(vc->em, 1, 0, 0); + EDBM_index_arrays_init(vc->em, 1, 0, 0); dm->foreachMappedVert(dm, mesh_foreachScreenVert__mapFunc, &data); - EDBM_free_index_arrays(vc->em); + EDBM_index_arrays_free(vc->em); dm->release(dm); } @@ -2100,7 +2100,7 @@ static int is_co_in_region(ARegion *ar, const short co[2]) static void mesh_foreachScreenEdge__mapFunc(void *userData, int index, float *v0co, float *v1co) { foreachScreenEdge_userData *data = userData; - BMEdge *eed = EDBM_get_edge_for_index(data->vc.em, index); + BMEdge *eed = EDBM_edge_at_index(data->vc.em, index); if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { short s[2][2]; @@ -2147,9 +2147,9 @@ void mesh_foreachScreenEdge( if (clipVerts != V3D_CLIP_TEST_OFF) ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */ - EDBM_init_index_arrays(vc->em, 0, 1, 0); + EDBM_index_arrays_init(vc->em, 0, 1, 0); dm->foreachMappedEdge(dm, mesh_foreachScreenEdge__mapFunc, &data); - EDBM_free_index_arrays(vc->em); + EDBM_index_arrays_free(vc->em); dm->release(dm); } @@ -2157,7 +2157,7 @@ void mesh_foreachScreenEdge( static void mesh_foreachScreenFace__mapFunc(void *userData, int index, float *cent, float *UNUSED(no)) { foreachScreenFace_userData *data = userData; - BMFace *efa = EDBM_get_face_for_index(data->vc.em, index); + BMFace *efa = EDBM_face_at_index(data->vc.em, index); if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { float cent2[3]; @@ -2187,9 +2187,9 @@ void mesh_foreachScreenFace( //if (clipVerts) ED_view3d_clipping_local(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */ - EDBM_init_index_arrays(vc->em, 0, 0, 1); + EDBM_index_arrays_init(vc->em, 0, 0, 1); dm->foreachMappedFaceCenter(dm, mesh_foreachScreenFace__mapFunc, &data); - EDBM_free_index_arrays(vc->em); + EDBM_index_arrays_free(vc->em); dm->release(dm); } @@ -2261,7 +2261,7 @@ void nurbs_foreachScreenVert( static void draw_dm_face_normals__mapFunc(void *userData, int index, float *cent, float *no) { drawDMNormal_userData *data = userData; - BMFace *efa = EDBM_get_face_for_index(data->em, index); + BMFace *efa = EDBM_face_at_index(data->em, index); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { glVertex3fv(cent); @@ -2284,7 +2284,7 @@ static void draw_dm_face_normals(BMEditMesh *em, Scene *scene, DerivedMesh *dm) static void draw_dm_face_centers__mapFunc(void *userData, int index, float *cent, float *UNUSED(no)) { - BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index); + BMFace *efa = EDBM_face_at_index(((void **)userData)[0], index); int sel = *(((int **)userData)[1]); if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BM_elem_flag_test(efa, BM_ELEM_SELECT) == sel) { @@ -2303,7 +2303,7 @@ static void draw_dm_face_centers(BMEditMesh *em, DerivedMesh *dm, int sel) static void draw_dm_vert_normals__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s) { drawDMNormal_userData *data = userData; - BMVert *eve = EDBM_get_vert_for_index(data->em, index); + BMVert *eve = EDBM_vert_at_index(data->em, index); if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { glVertex3fv(co); @@ -2336,7 +2336,7 @@ static void draw_dm_vert_normals(BMEditMesh *em, Scene *scene, DerivedMesh *dm) static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s)) { drawDMVerts_userData *data = userData; - BMVert *eve = EDBM_get_vert_for_index(data->em, index); + BMVert *eve = EDBM_vert_at_index(data->em, index); 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 :/ */ @@ -2381,7 +2381,7 @@ static DMDrawOption draw_dm_edges_sel__setDrawOptions(void *userData, int index) drawDMEdgesSel_userData *data = userData; unsigned char *col; - eed = EDBM_get_edge_for_index(data->em, index); + eed = EDBM_edge_at_index(data->em, index); if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { if (eed == data->eed_act) { @@ -2422,7 +2422,7 @@ static void draw_dm_edges_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *ba /* Draw edges */ static DMDrawOption draw_dm_edges__setDrawOptions(void *userData, int index) { - if (BM_elem_flag_test(EDBM_get_edge_for_index(userData, index), BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(EDBM_edge_at_index(userData, index), BM_ELEM_HIDDEN)) return DM_DRAW_OPTION_SKIP; else return DM_DRAW_OPTION_NORMAL; @@ -2436,14 +2436,14 @@ static void draw_dm_edges(BMEditMesh *em, DerivedMesh *dm) /* Draw edges with color interpolated based on selection */ static DMDrawOption draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index) { - if (BM_elem_flag_test(EDBM_get_edge_for_index(((void **)userData)[0], index), BM_ELEM_HIDDEN)) + if (BM_elem_flag_test(EDBM_edge_at_index(((void **)userData)[0], index), BM_ELEM_HIDDEN)) return DM_DRAW_OPTION_SKIP; else return DM_DRAW_OPTION_NORMAL; } 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); + BMEdge *eed = EDBM_edge_at_index(((void **)userData)[0], index); unsigned char **cols = userData; 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]; @@ -2464,7 +2464,7 @@ static void draw_dm_edges_sel_interp(BMEditMesh *em, DerivedMesh *dm, unsigned c /* Draw only seam edges */ static DMDrawOption draw_dm_edges_seams__setDrawOptions(void *userData, int index) { - BMEdge *eed = EDBM_get_edge_for_index(userData, index); + BMEdge *eed = EDBM_edge_at_index(userData, index); if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BM_elem_flag_test(eed, BM_ELEM_SEAM)) return DM_DRAW_OPTION_NORMAL; @@ -2480,7 +2480,7 @@ static void draw_dm_edges_seams(BMEditMesh *em, DerivedMesh *dm) /* Draw only sharp edges */ static DMDrawOption draw_dm_edges_sharp__setDrawOptions(void *userData, int index) { - BMEdge *eed = EDBM_get_edge_for_index(userData, index); + BMEdge *eed = EDBM_edge_at_index(userData, index); if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && !BM_elem_flag_test(eed, BM_ELEM_SMOOTH)) return DM_DRAW_OPTION_NORMAL; @@ -2499,7 +2499,7 @@ static void draw_dm_edges_sharp(BMEditMesh *em, DerivedMesh *dm) static DMDrawOption draw_dm_faces_sel__setDrawOptions(void *userData, int index) { drawDMFacesSel_userData *data = userData; - BMFace *efa = EDBM_get_face_for_index(data->em, index); + BMFace *efa = EDBM_face_at_index(data->em, index); unsigned char *col; if (!efa) @@ -2533,8 +2533,8 @@ static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int if (!data->orig_index) return 0; - efa = EDBM_get_face_for_index(data->em, data->orig_index[index]); - next_efa = EDBM_get_face_for_index(data->em, data->orig_index[next_index]); + efa = EDBM_face_at_index(data->em, data->orig_index[index]); + next_efa = EDBM_face_at_index(data->em, data->orig_index[next_index]); if (efa == next_efa) return 1; @@ -2570,7 +2570,7 @@ static void draw_dm_faces_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *ba static DMDrawOption draw_dm_creases__setDrawOptions(void *userData, int index) { BMEditMesh *em = userData; - BMEdge *eed = EDBM_get_edge_for_index(userData, index); + BMEdge *eed = EDBM_edge_at_index(userData, index); float *crease = eed ? (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_CREASE) : NULL; if (!crease) @@ -2594,7 +2594,7 @@ static void draw_dm_creases(BMEditMesh *em, DerivedMesh *dm) static DMDrawOption draw_dm_bweights__setDrawOptions(void *userData, int index) { BMEditMesh *em = userData; - BMEdge *eed = EDBM_get_edge_for_index(userData, index); + BMEdge *eed = EDBM_edge_at_index(userData, index); float *bweight = (float *)CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_BWEIGHT); if (!bweight) @@ -2611,7 +2611,7 @@ static DMDrawOption draw_dm_bweights__setDrawOptions(void *userData, int index) static void draw_dm_bweights__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s)) { BMEditMesh *em = userData; - BMVert *eve = EDBM_get_vert_for_index(userData, index); + BMVert *eve = EDBM_vert_at_index(userData, index); float *bweight = (float *)CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_BWEIGHT); if (!bweight) @@ -2983,7 +2983,7 @@ static void draw_em_indices(BMEditMesh *em) static DMDrawOption draw_em_fancy__setFaceOpts(void *userData, int index) { - BMFace *efa = EDBM_get_face_for_index(userData, index); + BMFace *efa = EDBM_face_at_index(userData, index); if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { GPU_enable_material(efa->mat_nr + 1, NULL); @@ -2995,7 +2995,7 @@ static DMDrawOption draw_em_fancy__setFaceOpts(void *userData, int index) static DMDrawOption draw_em_fancy__setGLSLFaceOpts(void *userData, int index) { - BMFace *efa = EDBM_get_face_for_index(userData, index); + BMFace *efa = EDBM_face_at_index(userData, index); if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) return DM_DRAW_OPTION_SKIP; @@ -3029,7 +3029,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, } } - EDBM_init_index_arrays(em, 1, 1, 1); + EDBM_index_arrays_init(em, 1, 1, 1); if (dt > OB_WIRE) { if (CHECK_OB_DRAWTEXTURE(v3d, dt)) { @@ -3179,7 +3179,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, GPU_disable_material(); } - EDBM_free_index_arrays(em); + EDBM_index_arrays_free(em); } /* Mesh drawing routines */ @@ -7167,7 +7167,7 @@ static void bbs_mesh_verts__mapFunc(void *userData, int index, float *co, float { void **ptrs = userData; int offset = (intptr_t) ptrs[0]; - BMVert *eve = EDBM_get_vert_for_index(ptrs[1], index); + BMVert *eve = EDBM_vert_at_index(ptrs[1], index); if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { WM_set_framebuffer_index_color(offset + index); @@ -7189,7 +7189,7 @@ static DMDrawOption bbs_mesh_wire__setDrawOptions(void *userData, int index) { void **ptrs = userData; int offset = (intptr_t) ptrs[0]; - BMEdge *eed = EDBM_get_edge_for_index(ptrs[1], index); + BMEdge *eed = EDBM_edge_at_index(ptrs[1], index); if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { WM_set_framebuffer_index_color(offset + index); @@ -7207,7 +7207,7 @@ static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset) static DMDrawOption bbs_mesh_solid__setSolidDrawOptions(void *userData, int index) { - BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index); + BMFace *efa = EDBM_face_at_index(((void **)userData)[0], index); if (efa && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { if (((void **)userData)[1]) { @@ -7222,7 +7222,7 @@ static DMDrawOption bbs_mesh_solid__setSolidDrawOptions(void *userData, int inde static void bbs_mesh_solid__drawCenter(void *userData, int index, float *cent, float *UNUSED(no)) { - BMFace *efa = EDBM_get_face_for_index(((void **)userData)[0], index); + BMFace *efa = EDBM_face_at_index(((void **)userData)[0], index); if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { WM_set_framebuffer_index_color(index + 1); @@ -7319,7 +7319,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec DerivedMesh *dm = editbmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH); - EDBM_init_index_arrays(em, 1, 1, 1); + EDBM_index_arrays_init(em, 1, 1, 1); bbs_mesh_solid_EM(em, scene, v3d, ob, dm, ts->selectmode & SCE_SELECT_FACE); if (ts->selectmode & SCE_SELECT_FACE) @@ -7346,7 +7346,7 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec dm->release(dm); - EDBM_free_index_arrays(em); + EDBM_index_arrays_free(em); } else { Mesh *me = ob->data; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index f714260ed41..08d0afb1879 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -445,7 +445,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } - EDBM_RecalcNormals(em); + EDBM_mesh_normals_update(em); } if (median[3] != 0.0f) { @@ -523,7 +523,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } } - EDBM_RecalcNormals(em); + EDBM_mesh_normals_update(em); } else if (ELEM(ob->type, OB_CURVE, OB_SURF)) { Curve *cu = ob->data; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index aa76d9a94c1..a3031bc3cfa 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -374,7 +374,7 @@ static void do_view3d_header_buttons(bContext *C, void *UNUSED(arg), int event) if (em) { if (shift == 0 || em->selectmode == 0) { if ( (em->selectmode ^ SCE_SELECT_EDGE) == SCE_SELECT_VERTEX) { - if (ctrl) EDBM_convertsel(em, SCE_SELECT_VERTEX, SCE_SELECT_EDGE); + if (ctrl) EDBM_selectmode_convert(em, SCE_SELECT_VERTEX, SCE_SELECT_EDGE); } em->selectmode = SCE_SELECT_EDGE; } @@ -388,7 +388,7 @@ static void do_view3d_header_buttons(bContext *C, void *UNUSED(arg), int event) if (em) { if (shift == 0 || em->selectmode == 0) { if ( ((ts->selectmode ^ SCE_SELECT_FACE) == SCE_SELECT_VERTEX) || ((ts->selectmode ^ SCE_SELECT_FACE) == SCE_SELECT_EDGE)) { - if (ctrl) EDBM_convertsel(em, (ts->selectmode ^ SCE_SELECT_FACE), SCE_SELECT_FACE); + if (ctrl) EDBM_selectmode_convert(em, (ts->selectmode ^ SCE_SELECT_FACE), SCE_SELECT_FACE); } em->selectmode = SCE_SELECT_FACE; } diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 4251592e986..5646570a623 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -166,7 +166,7 @@ void view3d_get_transformation(const ARegion *ar, RegionView3D *rv3d, Object *ob /* local prototypes */ -static void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select) +static void edbm_backbuf_check_and_select_verts(BMEditMesh *em, int select) { BMVert *eve; BMIter iter; @@ -175,14 +175,14 @@ static void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select) 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)) { + if (EDBM_backbuf_check(index)) { BM_vert_select_set(em->bm, eve, select); } } } } -static void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select) +static void edbm_backbuf_check_and_select_edges(BMEditMesh *em, int select) { BMEdge *eed; BMIter iter; @@ -191,14 +191,14 @@ static void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select) 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)) { + if (EDBM_backbuf_check(index)) { BM_edge_select_set(em->bm, eed, select); } } } } -static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select) +static void edbm_backbuf_check_and_select_faces(BMEditMesh *em, int select) { BMFace *efa; BMIter iter; @@ -207,7 +207,7 @@ static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select) 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)) { + if (EDBM_backbuf_check(index)) { BM_face_select_set(em->bm, efa, select); } } @@ -216,14 +216,14 @@ static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select) /* object mode, EM_ prefix is confusing here, rename? */ -static void EDBM_backbuf_checkAndSelectVerts_obmode(Mesh *me, int select) +static void edbm_backbuf_check_and_select_verts_obmode(Mesh *me, int select) { MVert *mv = me->mvert; int a; if (mv) { for (a = 1; a <= me->totvert; a++, mv++) { - if (EDBM_check_backbuf(a)) { + if (EDBM_backbuf_check(a)) { if (!(mv->flag & ME_HIDE)) { mv->flag = select ? (mv->flag | SELECT) : (mv->flag & ~SELECT); } @@ -233,14 +233,14 @@ static void EDBM_backbuf_checkAndSelectVerts_obmode(Mesh *me, int select) } /* object mode, EM_ prefix is confusing here, rename? */ -static void EDBM_backbuf_checkAndSelectTFaces(Mesh *me, int select) +static void edbm_backbuf_check_and_select_tfaces(Mesh *me, int select) { MPoly *mpoly = me->mpoly; int a; if (mpoly) { for (a = 1; a <= me->totpoly; a++, mpoly++) { - if (EDBM_check_backbuf(a)) { + if (EDBM_backbuf_check(a)) { mpoly->flag = select ? (mpoly->flag | ME_FACE_SEL) : (mpoly->flag & ~ME_FACE_SEL); } } @@ -481,7 +481,7 @@ static void do_lasso_select_mesh__doSelectEdge(void *userData, BMEdge *eed, int { LassoSelectUserData *data = userData; - if (EDBM_check_backbuf(bm_solidoffs + index)) { + if (EDBM_backbuf_check(bm_solidoffs + index)) { if (data->pass == 0) { if (edge_fully_inside_rect(data->rect, x0, y0, x1, y1) && lasso_inside(data->mcords, data->moves, x0, y0) && @@ -533,11 +533,11 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves, ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); glLoadMatrixf(vc->rv3d->viewmat); - bbsel = EDBM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax); + bbsel = EDBM_backbuf_border_mask_init(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax); if (ts->selectmode & SCE_SELECT_VERTEX) { if (bbsel) { - EDBM_backbuf_checkAndSelectVerts(vc->em, select); + edbm_backbuf_check_and_select_verts(vc->em, select); } else { mesh_foreachScreenVert(vc, do_lasso_select_mesh__doSelectVert, &data, V3D_CLIP_TEST_RV3D_CLIPPING); @@ -556,14 +556,14 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves, if (ts->selectmode & SCE_SELECT_FACE) { if (bbsel) { - EDBM_backbuf_checkAndSelectFaces(vc->em, select); + edbm_backbuf_check_and_select_faces(vc->em, select); } else { mesh_foreachScreenFace(vc, do_lasso_select_mesh__doSelectFace, &data); } } - EDBM_free_backbuf(); + EDBM_backbuf_free(); EDBM_selectmode_flush(vc->em); } @@ -851,11 +851,11 @@ static void do_lasso_select_paintvert(ViewContext *vc, int mcords[][2], short mo bm_vertoffs = me->totvert + 1; /* max index array */ lasso_select_boundbox(&rect, mcords, moves); - EDBM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax); + EDBM_backbuf_border_mask_init(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax); - EDBM_backbuf_checkAndSelectVerts_obmode(me, select); + edbm_backbuf_check_and_select_verts_obmode(me, select); - EDBM_free_backbuf(); + EDBM_backbuf_free(); paintvert_flush_flags(ob); } @@ -874,11 +874,11 @@ static void do_lasso_select_paintface(ViewContext *vc, int mcords[][2], short mo bm_vertoffs = me->totpoly + 1; /* max index array */ lasso_select_boundbox(&rect, mcords, moves); - EDBM_mask_init_backbuf_border(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax); + EDBM_backbuf_border_mask_init(vc, mcords, moves, rect.xmin, rect.ymin, rect.xmax, rect.ymax); - EDBM_backbuf_checkAndSelectTFaces(me, select); + edbm_backbuf_check_and_select_tfaces(me, select); - EDBM_free_backbuf(); + EDBM_backbuf_free(); paintface_flush_flags(ob); } @@ -1763,7 +1763,7 @@ static void do_mesh_box_select__doSelectEdge(void *userData, BMEdge *eed, int x0 { BoxSelectUserData *data = userData; - if (EDBM_check_backbuf(bm_solidoffs + index)) { + if (EDBM_backbuf_check(bm_solidoffs + index)) { if (data->pass == 0) { if (edge_fully_inside_rect(data->rect, x0, y0, x1, y1)) { BM_elem_select_set(data->vc->em->bm, eed, data->select); @@ -1804,11 +1804,11 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); glLoadMatrixf(vc->rv3d->viewmat); - bbsel = EDBM_init_backbuf_border(vc, rect->xmin, rect->ymin, rect->xmax, rect->ymax); + bbsel = EDBM_backbuf_border_init(vc, rect->xmin, rect->ymin, rect->xmax, rect->ymax); if (ts->selectmode & SCE_SELECT_VERTEX) { if (bbsel) { - EDBM_backbuf_checkAndSelectVerts(vc->em, select); + edbm_backbuf_check_and_select_verts(vc->em, select); } else { mesh_foreachScreenVert(vc, do_mesh_box_select__doSelectVert, &data, V3D_CLIP_TEST_RV3D_CLIPPING); @@ -1828,14 +1828,14 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten if (ts->selectmode & SCE_SELECT_FACE) { if (bbsel) { - EDBM_backbuf_checkAndSelectFaces(vc->em, select); + edbm_backbuf_check_and_select_faces(vc->em, select); } else { mesh_foreachScreenFace(vc, do_mesh_box_select__doSelectFace, &data); } } - EDBM_free_backbuf(); + EDBM_backbuf_free(); EDBM_selectmode_flush(vc->em); @@ -2332,7 +2332,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f int bbsel; CircleSelectUserData data; - bbsel = EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad + 1.0)); + bbsel = EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0)); ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */ vc->em = BMEdit_FromObject(vc->obedit); @@ -2345,7 +2345,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f if (ts->selectmode & SCE_SELECT_VERTEX) { if (bbsel) { - EDBM_backbuf_checkAndSelectVerts(vc->em, select == LEFTMOUSE); + edbm_backbuf_check_and_select_verts(vc->em, select == LEFTMOUSE); } else { mesh_foreachScreenVert(vc, mesh_circle_doSelectVert, &data, V3D_CLIP_TEST_RV3D_CLIPPING); @@ -2354,7 +2354,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f if (ts->selectmode & SCE_SELECT_EDGE) { if (bbsel) { - EDBM_backbuf_checkAndSelectEdges(vc->em, select == LEFTMOUSE); + edbm_backbuf_check_and_select_edges(vc->em, select == LEFTMOUSE); } else { mesh_foreachScreenEdge(vc, mesh_circle_doSelectEdge, &data, V3D_CLIP_TEST_OFF); @@ -2363,14 +2363,14 @@ static void mesh_circle_select(ViewContext *vc, int select, const int mval[2], f if (ts->selectmode & SCE_SELECT_FACE) { if (bbsel) { - EDBM_backbuf_checkAndSelectFaces(vc->em, select == LEFTMOUSE); + edbm_backbuf_check_and_select_faces(vc->em, select == LEFTMOUSE); } else { mesh_foreachScreenFace(vc, mesh_circle_doSelectFace, &data); } } - EDBM_free_backbuf(); + EDBM_backbuf_free(); EDBM_selectmode_flush(vc->em); } @@ -2383,9 +2383,9 @@ static void paint_facesel_circle_select(ViewContext *vc, int select, const int m if (me) { bm_vertoffs = me->totpoly + 1; /* max index array */ - /* bbsel= */ /* UNUSED */ EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad + 1.0)); - EDBM_backbuf_checkAndSelectTFaces(me, select == LEFTMOUSE); - EDBM_free_backbuf(); + /* bbsel= */ /* UNUSED */ EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0)); + edbm_backbuf_check_and_select_tfaces(me, select == LEFTMOUSE); + EDBM_backbuf_free(); } } @@ -2399,9 +2399,9 @@ static void paint_vertsel_circle_select(ViewContext *vc, int select, const int m if (me) { bm_vertoffs = me->totvert + 1; /* max index array */ - /* bbsel= */ /* UNUSED */ EDBM_init_backbuf_circle(vc, mval[0], mval[1], (short)(rad + 1.0f)); - EDBM_backbuf_checkAndSelectVerts_obmode(me, select == LEFTMOUSE); - EDBM_free_backbuf(); + /* bbsel= */ /* UNUSED */ EDBM_backbuf_circle_init(vc, mval[0], mval[1], (short)(rad + 1.0f)); + edbm_backbuf_check_and_select_verts_obmode(me, select == LEFTMOUSE); + EDBM_backbuf_free(); paintvert_flush_flags(ob); } diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 9d160fb361a..ac94accf991 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -198,7 +198,7 @@ static void set_mapped_co(void *vuserdata, int index, float *co, float *UNUSED(n void **userdata = vuserdata; BMEditMesh *em = userdata[0]; TransVert *tv = userdata[1]; - BMVert *eve = EDBM_get_vert_for_index(em, index); + BMVert *eve = EDBM_vert_at_index(em, index); 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); @@ -317,9 +317,9 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) } if (transvmain && em->derivedCage) { - EDBM_init_index_arrays(em, 1, 0, 0); + EDBM_index_arrays_init(em, 1, 0, 0); em->derivedCage->foreachMappedVert(em->derivedCage, set_mapped_co, userdata); - EDBM_free_index_arrays(em); + EDBM_index_arrays_free(em); } } else if (obedit->type == OB_ARMATURE) { @@ -991,7 +991,7 @@ static int snap_curs_to_active(bContext *C, wmOperator *UNUSED(op)) Mesh *me = obedit->data; BMEditSelection ese; - if (EDBM_get_actSelection(me->edit_btmesh, &ese)) { + if (EDBM_editselection_active_get(me->edit_btmesh, &ese)) { EDBM_editselection_center(me->edit_btmesh, curs, &ese); } |