From 09f29c0b70357684b270745167cc30a3134b8d98 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 27 Mar 2012 04:46:52 +0000 Subject: style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions --- .../blender/editors/transform/transform_conversions.c | 6 +++--- source/blender/editors/transform/transform_generics.c | 4 ++-- .../blender/editors/transform/transform_manipulator.c | 2 +- .../blender/editors/transform/transform_orientations.c | 2 +- source/blender/editors/transform/transform_snap.c | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 3f15a05d843..4754e1731c8 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2037,7 +2037,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t) if (t->flag & T_MIRROR) { - EDBM_CacheMirrorVerts(em, TRUE); + EDBM_verts_mirror_cache_begin(em, TRUE); mirror = 1; } @@ -2226,7 +2226,7 @@ static void createTransEditVerts(bContext *C, TransInfo *t) /* Mirror? */ if ( (mirror>0 && tob->iloc[0]>0.0f) || (mirror<0 && tob->iloc[0]<0.0f)) { - BMVert *vmir= EDBM_GetMirrorVert(em, eve); //t->obedit, em, eve, tob->iloc, a); + BMVert *vmir= EDBM_verts_mirror_get(em, eve); //t->obedit, em, eve, tob->iloc, a); if (vmir && vmir != eve) { tob->extra = vmir; } @@ -2260,7 +2260,7 @@ cleanup: MEM_freeN(selstate); if (t->flag & T_MIRROR) { - EDBM_EndMirrorCache(em); + EDBM_verts_mirror_cache_end(em); mirror = 1; } } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 19dc968a8d2..eb04ad04aa7 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -724,7 +724,7 @@ static void recalcData_view3d(TransInfo *t) DAG_id_tag_update(t->obedit->data, 0); /* sets recalc flags */ - EDBM_RecalcNormals(em); + EDBM_mesh_normals_update(em); BMEdit_RecalcTessellation(em); } else if (t->obedit->type==OB_ARMATURE) { /* no recalc flag, does pose */ @@ -1523,7 +1523,7 @@ void calculateCenter(TransInfo *t) BMEditSelection ese; BMEditMesh *em = BMEdit_FromObject(t->obedit); - if (EDBM_get_actSelection(em, &ese)) { + if (EDBM_editselection_active_get(em, &ese)) { EDBM_editselection_center(em, t->center, &ese); calculateCenter2D(t); break; diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index ece556f11ae..513f7df1957 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -300,7 +300,7 @@ int calc_manipulator_stats(const bContext *C) float vec[3]= {0,0,0}; /* USE LAST SELECTE WITH ACTIVE */ - if (v3d->around==V3D_ACTIVE && EDBM_get_actSelection(em, &ese)) { + if (v3d->around==V3D_ACTIVE && EDBM_editselection_active_get(em, &ese)) { EDBM_editselection_center(em, vec, &ese); calc_tw_center(scene, vec); totsel= 1; diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 2a53a8e4ad2..d2cf74881f2 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -577,7 +577,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3], float vec[3]= {0,0,0}; /* USE LAST SELECTED WITH ACTIVE */ - if (activeOnly && EDBM_get_actSelection(em, &ese)) { + if (activeOnly && EDBM_editselection_active_get(em, &ese)) { EDBM_editselection_normal(normal, &ese); EDBM_editselection_plane(em, plane, &ese); diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 7ad7b0f5c40..ea21a636300 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1412,7 +1412,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh if (em != NULL) { index_array = dm->getTessFaceDataArray(dm, CD_ORIGINDEX); - EDBM_init_index_arrays(em, 0, 0, 1); + EDBM_index_arrays_init(em, 0, 0, 1); } for ( i = 0; i < totface; i++) { @@ -1434,7 +1434,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh test = 0; } else { - efa = EDBM_get_face_for_index(em, index); + efa = EDBM_face_at_index(em, index); if (efa && BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { @@ -1478,7 +1478,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh if (em != NULL) { - EDBM_free_index_arrays(em); + EDBM_index_arrays_free(em); } #endif break; @@ -1493,7 +1493,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh if (em != NULL) { index_array = dm->getVertDataArray(dm, CD_ORIGINDEX); - EDBM_init_index_arrays(em, 1, 0, 0); + EDBM_index_arrays_init(em, 1, 0, 0); } for ( i = 0; i < totvert; i++) { @@ -1514,7 +1514,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh test = 0; } else { - eve = EDBM_get_vert_for_index(em, index); + eve = EDBM_vert_at_index(em, index); if (eve && (BM_elem_flag_test(eve, BM_ELEM_HIDDEN) || BM_elem_flag_test(eve, BM_ELEM_SELECT))) { @@ -1532,7 +1532,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh if (em != NULL) { - EDBM_free_index_arrays(em); + EDBM_index_arrays_free(em); } break; } @@ -1548,7 +1548,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh if (em != NULL) { index_array = dm->getEdgeDataArray(dm, CD_ORIGINDEX); - EDBM_init_index_arrays(em, 0, 1, 0); + EDBM_index_arrays_init(em, 0, 1, 0); } for ( i = 0; i < totedge; i++) { @@ -1570,7 +1570,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh test = 0; } else { - eed = EDBM_get_edge_for_index(em, index); + eed = EDBM_edge_at_index(em, index); if (eed && (BM_elem_flag_test(eed, BM_ELEM_HIDDEN) || BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || @@ -1590,7 +1590,7 @@ static int snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMesh if (em != NULL) { - EDBM_free_index_arrays(em); + EDBM_index_arrays_free(em); } break; } -- cgit v1.2.3