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/mesh/mesh_navmesh.c | |
| 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/mesh/mesh_navmesh.c')
| -rw-r--r-- | source/blender/editors/mesh/mesh_navmesh.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; } |