code cleanup: change C naming convention (so py and C api match), eg:

    C: BM_face_calc_area(f), Py: BMFace.calc_area()

4 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c
index fbbe376a18f..42857bd7270 100644
--- a/source/blender/editors/mesh/editmesh_rip.c
+++ b/source/blender/editors/mesh/editmesh_rip.c
@@ -454,10 +454,10 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, wmEvent *event)
 				BM_ITER_ELEM (l, &iter, vout[i], BM_LOOPS_OF_VERT) {
 					if (!BM_elem_flag_test(l->f, BM_ELEM_HIDDEN)) {
 						float l_mid_co[3];
-						BM_loop_face_tangent(l, l_mid_co);
+						BM_loop_calc_face_tangent(l, l_mid_co);
 
 						/* scale to average of surrounding edge size, only needs to be approx */
-						mul_v3_fl(l_mid_co, (BM_edge_length_calc(l->e) + BM_edge_length_calc(l->prev->e)) / 2.0f);
+						mul_v3_fl(l_mid_co, (BM_edge_calc_length(l->e) + BM_edge_calc_length(l->prev->e)) / 2.0f);
 						add_v3_v3(l_mid_co, v->co);
 
 						d = edbm_rip_rip_edgedist(ar, projectMat, v->co, l_mid_co, fmval);
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index c6172492025..effaa405218 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2845,7 +2845,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 	}
 
 	if (me->drawflag & ME_DRAWEXTRA_FACEAREA) {
-		/* would be nice to use BM_face_area_calc, but that is for 2d faces
+		/* would be nice to use BM_face_calc_area, but that is for 2d faces
 		 * so instead add up tessellation triangle areas */
 		BMFace *f;
 		int n;
@@ -2910,7 +2910,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 			BMIter liter;
 			BMLoop *loop;
 
-			BM_face_center_bounds_calc(efa, vmid);
+			BM_face_calc_center_bounds(efa, vmid);
 
 			for (loop = BM_iter_new(&liter, em->bm, BM_LOOPS_OF_FACE, efa);
 			     loop; loop = BM_iter_step(&liter))
@@ -2984,7 +2984,7 @@ static void draw_em_indices(BMEditMesh *em)
 		UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
 		BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
 			if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
-				BM_face_center_mean_calc(f, pos);
+				BM_face_calc_center_mean(f, pos);
 				sprintf(numstr, "%d", i);
 				view3d_cached_text_draw_add(pos, numstr, 0, txt_flag, col);
 			}
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index fecd32c06a0..57540b58f61 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -1961,7 +1961,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f
 
 	BM_ITER_ELEM (efa, &iter, eve, BM_FACES_OF_VERT) {
 		if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
-			BM_face_center_mean_calc(efa, cent_r);
+			BM_face_calc_center_mean(efa, cent_r);
 			break;
 		}
 	}
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index f40e344deb7..9084e5770ed 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -200,7 +200,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 
 				poly_copy_aspect(tf_uvorig, tf_uv, aspx, aspy, efa->len);
 
-				totarea += BM_face_area_calc(efa);
+				totarea += BM_face_calc_area(efa);
 				//totuvarea += tf_area(tf, efa->v4!=0);
 				totuvarea += poly_uv_area(tf_uv, efa->len);
 				
@@ -232,7 +232,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 			else {
 				BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 					if (BM_elem_flag_test(efa, BM_ELEM_TAG)) {
-						area = BM_face_area_calc(efa) / totarea;
+						area = BM_face_calc_area(efa) / totarea;
 
 						BLI_array_empty(tf_uv);
 						BLI_array_empty(tf_uvorig);