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).

4 files changed, 22 insertions, 22 deletions

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);