diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 10:24:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-12 10:24:12 +0400 |
commit | 8b43813b69b36af55635028e18e9b179df217317 (patch) | |
tree | c6066dd2c5200c1972be1968c32cfc5050b15848 /source/blender/editors/space_view3d | |
parent | 467e49e5e594eebe52300594693501a6995ba070 (diff) |
rename BM_ flags for `BMHeader->hflag` to BM_ELEM_ to be more clear that these flags apply to bmesh elements.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 72 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 16 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 6 |
5 files changed, 54 insertions, 54 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 6f38cfc78ef..4734d54497d 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_HIDDEN)) { + if (efa==NULL || BM_TestHFlag(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_HIDDEN); + return !BM_TestHFlag(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 84c8eaf5902..226073c2cf9 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_HIDDEN)) { + if (!BM_TestHFlag(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_HIDDEN)) { + if (!BM_TestHFlag(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_HIDDEN)) { + if (efa && !BM_TestHFlag(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_HIDDEN)) { + if (!BM_TestHFlag(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_HIDDEN) && BM_TestHFlag(efa, BM_SELECT)==sel) { + if (efa && !BM_TestHFlag(efa, BM_ELEM_HIDDEN) && BM_TestHFlag(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_HIDDEN)) { + if (!BM_TestHFlag(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_HIDDEN) && BM_TestHFlag(eve, BM_SELECT)==data->sel) { + if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && BM_TestHFlag(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_HIDDEN)) { + if (!BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { if (eed==data->eed_act) { glColor4ubv(data->actCol); } else { - if (BM_TestHFlag(eed, BM_SELECT)) { + if (BM_TestHFlag(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_HIDDEN); + return !BM_TestHFlag(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_HIDDEN); + return !BM_TestHFlag(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_SELECT))?2:1]; - unsigned char *col1 = cols[(BM_TestHFlag(eed->v2, BM_SELECT))?2:1]; + 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]; 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_HIDDEN) && BM_TestHFlag(eed, BM_SEAM); + return !BM_TestHFlag(eed, BM_ELEM_HIDDEN) && BM_TestHFlag(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_HIDDEN) && BM_TestHFlag(eed, BM_SHARP); + return !BM_TestHFlag(eed, BM_ELEM_HIDDEN) && BM_TestHFlag(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_HIDDEN)) { + if (!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { if (efa == data->efa_act) { glColor4ubv(data->cols[2]); return 2; /* stipple */ } else { - col = data->cols[BM_TestHFlag(efa, BM_SELECT)?1:0]; + col = data->cols[BM_TestHFlag(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_SELECT)?1:0]; - next_col = data->cols[BM_TestHFlag(next_efa, BM_SELECT)?1: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]; 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_HIDDEN) && *crease!=0.0f) { + if (!BM_TestHFlag(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_HIDDEN) && *bweight!=0.0f) { + if (!BM_TestHFlag(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_HIDDEN) && *bweight!=0.0f) { + if (!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && *bweight!=0.0f) { UI_ThemeColorBlend(TH_VERTEX, TH_VERTEX_SELECT, *bweight); bglVertex3fv(co); } @@ -2756,8 +2756,8 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); for(; eed; eed=BMIter_Step(&iter)) { /* draw selected edges, or edges next to selected verts while draging */ - if(BM_TestHFlag(eed, BM_SELECT) || - (do_moving && (BM_TestHFlag(eed->v1, BM_SELECT) || BM_TestHFlag(eed->v2, BM_SELECT) ))) { + if(BM_TestHFlag(eed, BM_ELEM_SELECT) || + (do_moving && (BM_TestHFlag(eed->v1, BM_ELEM_SELECT) || BM_TestHFlag(eed->v2, BM_ELEM_SELECT) ))) { copy_v3_v3(v1, eed->v1->co); copy_v3_v3(v2, eed->v2->co); @@ -2789,7 +2789,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS int n; #define DRAW_EM_MEASURE_STATS_FACEAREA() \ - if (BM_TestHFlag(f, BM_SELECT)) { \ + if (BM_TestHFlag(f, BM_ELEM_SELECT)) { \ mul_v3_fl(vmid, 1.0/n); \ if(unit->system) \ bUnit_AsString(numstr, sizeof(numstr), area*unit->scale_length, \ @@ -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_SELECT)) || - (do_moving && BM_TestHFlag(loop->v, BM_SELECT))) + if ( (BM_TestHFlag(efa, BM_ELEM_SELECT)) || + (do_moving && BM_TestHFlag(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_SELECT)) { + if (BM_TestHFlag(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_SELECT)) { + if (BM_TestHFlag(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,7 +2919,7 @@ 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_SELECT)) { + if (BM_TestHFlag(f, BM_ELEM_SELECT)) { BM_Compute_Face_CenterMean(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_HIDDEN)) { + if (efa && !BM_TestHFlag(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_HIDDEN); + return !BM_TestHFlag(efa, BM_ELEM_HIDDEN); } static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, @@ -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_HIDDEN)) { + if (!BM_TestHFlag(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_HIDDEN)) { + if (!BM_TestHFlag(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_HIDDEN)) { + if (efa && !BM_TestHFlag(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_HIDDEN)) { + if (!BM_TestHFlag(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 55481d6aa72..d2ea10de2ba 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_SELECT)) { + if(BM_TestHFlag(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_SELECT)) { + if(BM_TestHFlag(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_SELECT)) { + if(BM_TestHFlag(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_SELECT)) { + if(BM_TestHFlag(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_SELECT) && !BM_TestHFlag(eed, BM_HIDDEN)) { + if(BM_TestHFlag(eed, BM_ELEM_SELECT) && !BM_TestHFlag(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_SELECT) && !BM_TestHFlag(eed, BM_HIDDEN)) { + if(BM_TestHFlag(eed, BM_ELEM_SELECT) && !BM_TestHFlag(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_SELECT) && eve != eve_act) { + if(BM_TestHFlag(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); @@ -733,7 +733,7 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr) 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_SELECT) && eve != eve_act) { + if(BM_TestHFlag(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 5d7901a481b..d0a4ac14c20 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -173,7 +173,7 @@ static void EDBM_backbuf_checkAndSelectVerts(BMEditMesh *em, int select) eve = BMIter_New(&iter, em->bm, BM_VERTS_OF_MESH, NULL); for ( ; eve; eve=BMIter_Step(&iter), index++) { - if(!BM_TestHFlag(eve, BM_HIDDEN)) { + if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN)) { if(EDBM_check_backbuf(index)) { BM_Select_Vert(em->bm, eve, select); } @@ -189,7 +189,7 @@ static void EDBM_backbuf_checkAndSelectEdges(BMEditMesh *em, int select) eed = BMIter_New(&iter, em->bm, BM_EDGES_OF_MESH, NULL); for ( ; eed; eed=BMIter_Step(&iter), index++) { - if(!BM_TestHFlag(eed, BM_HIDDEN)) { + if(!BM_TestHFlag(eed, BM_ELEM_HIDDEN)) { if(EDBM_check_backbuf(index)) { BM_Select_Edge(em->bm, eed, select); } @@ -205,7 +205,7 @@ static void EDBM_backbuf_checkAndSelectFaces(BMEditMesh *em, int select) efa = BMIter_New(&iter, em->bm, BM_FACES_OF_MESH, NULL); for ( ; efa; efa=BMIter_Step(&iter), index++) { - if(!BM_TestHFlag(efa, BM_HIDDEN)) { + if(!BM_TestHFlag(efa, BM_ELEM_HIDDEN)) { if(EDBM_check_backbuf(index)) { BM_Select_Face(em->bm, efa, select); } @@ -525,7 +525,7 @@ static void do_lasso_select_mesh(ViewContext *vc, int mcords[][2], short moves, data.pass = 0; if (extend == 0 && select) - EDBM_clear_flag_all(vc->em, BM_SELECT); + EDBM_clear_flag_all(vc->em, BM_ELEM_SELECT); /* for non zbuf projections, dont change the GL state */ ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); @@ -1782,7 +1782,7 @@ static int do_mesh_box_select(ViewContext *vc, rcti *rect, int select, int exten data.done = 0; if (extend == 0 && select) - EDBM_clear_flag_all(vc->em, BM_SELECT); + EDBM_clear_flag_all(vc->em, BM_ELEM_SELECT); /* for non zbuf projections, dont change the GL state */ ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 7cb64977a28..de15ea99256 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -242,7 +242,7 @@ 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_HIDDEN) && BM_TestHFlag(eve, BM_SELECT)) { + if(!BM_TestHFlag(eve, BM_ELEM_HIDDEN) && BM_TestHFlag(eve, BM_ELEM_SELECT)) { BM_SetIndex(eve, 1); /* set_dirty! */ tottrans++; } @@ -256,7 +256,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) BM_SetIndex(eve, 0); /* set_dirty! */ BM_ITER(eed, &iter, bm, BM_EDGES_OF_MESH, NULL) { - if(!BM_TestHFlag(eed, BM_HIDDEN) && BM_TestHFlag(eed, BM_SELECT)) { + 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! */ } @@ -272,7 +272,7 @@ static void make_trans_verts(Object *obedit, float *min, float *max, int mode) BM_SetIndex(eve, 0); /* set_dirty! */ BM_ITER(efa, &iter, bm, BM_FACES_OF_MESH, NULL) { - if(!BM_TestHFlag(efa, BM_HIDDEN) && BM_TestHFlag(efa, BM_SELECT)) { + if(!BM_TestHFlag(efa, BM_ELEM_HIDDEN) && BM_TestHFlag(efa, BM_ELEM_SELECT)) { BMIter liter; BMLoop *l; |