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

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

3 files changed, 15 insertions, 15 deletions

diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index fe9e40aad44..8e7723fefdd 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -486,10 +486,10 @@ void dummy_exec(BMesh *bm, BMOperator *op)
  * convert angles [0-PI/2] -> [0-1], multiply together, then convert back to radians. */
 float bm_vert_edge_face_angle(BMVert *v)
 {
-	const float angle = BM_vert_edge_angle(v);
+	const float angle = BM_vert_calc_edge_angle(v);
 	/* note: could be either edge, it doesn't matter */
 	if (v->e && BM_edge_is_manifold(v->e)) {
-		return ((angle * ANGLE_TO_UNIT) * (BM_edge_face_angle(v->e) * ANGLE_TO_UNIT)) * UNIT_TO_ANGLE;
+		return ((angle * ANGLE_TO_UNIT) * (BM_edge_calc_face_angle(v->e) * ANGLE_TO_UNIT)) * UNIT_TO_ANGLE;
 	}
 	else {
 		return angle;
@@ -528,7 +528,7 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op)
 	/* go through and split edge */
 	for (i = 0, tot_found = 0; i < einput->len; i++) {
 		BMEdge *e = ((BMEdge **)einput->data.p)[i];
-		const float angle = BM_edge_face_angle(e);
+		const float angle = BM_edge_calc_face_angle(e);
 
 		if (angle < angle_limit) {
 			tot_found++;
@@ -546,7 +546,7 @@ void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op)
 			if (/* may have become non-manifold */
 			    BM_edge_is_manifold(e) &&
 			    /* check twice because cumulative effect could dissolve over angle limit */
-			    (BM_edge_face_angle(e) < angle_limit))
+			    (BM_edge_calc_face_angle(e) < angle_limit))
 			{
 				BMFace *nf = BM_faces_join_pair(bm, e->l->f,
 				                                e->l->radial_next->f,
diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c
index 1e131fa4b7b..6e3024c0fa1 100644
--- a/source/blender/bmesh/operators/bmo_inset.c
+++ b/source/blender/bmesh/operators/bmo_inset.c
@@ -90,7 +90,7 @@ float bm_vert_avg_tag_dist(BMVert *v)
 	BM_ITER_ELEM_INDEX (e, &iter, v, BM_EDGES_OF_VERT, tot) {
 		BMVert *v_other = BM_edge_other_vert(e, v);
 		if (BM_elem_flag_test(v_other, BM_ELEM_TAG)) {
-			length += BM_edge_length_calc(e);
+			length += BM_edge_calc_length(e);
 		}
 	}
 
@@ -173,7 +173,7 @@ void bmo_inset_exec(BMesh *bm, BMOperator *op)
 		i = BM_elem_index_get(e);
 		if (i != -1) {
 			/* calc edge-split info */
-			es->length = BM_edge_length_calc(e);
+			es->length = BM_edge_calc_length(e);
 			es->e_old = e;
 			es++;
 			/* initialize no and e_new after */
@@ -194,7 +194,7 @@ void bmo_inset_exec(BMesh *bm, BMOperator *op)
 
 		/* calc edge-split info */
 		es->e_new = es->l->e;
-		BM_edge_face_tangent(es->e_new, es->l, es->no);
+		BM_edge_calc_face_tangent(es->e_new, es->l, es->no);
 
 		if (es->e_new == es->e_old) { /* happens on boundary edges */
 			/* take care here, we're creating this double edge which _must_ have its verts replaced later on */
@@ -516,7 +516,7 @@ void bmo_inset_exec(BMesh *bm, BMOperator *op)
 		}
 
 		/* do in 2 passes so moving the verts doesn't feed back into face angle checks
-		 * which BM_vert_shell_factor uses. */
+		 * which BM_vert_calc_shell_factor uses. */
 
 		/* over allocate */
 		varr_co = MEM_callocN(sizeof(*varr_co) * bm->totvert, __func__);
@@ -525,7 +525,7 @@ void bmo_inset_exec(BMesh *bm, BMOperator *op)
 			if (BM_elem_flag_test(v, BM_ELEM_TAG)) {
 				const float fac = (depth *
 								   (use_relative_offset ? bm_vert_avg_tag_dist(v) : 1.0f) *
-								   (use_even_boundry    ? BM_vert_shell_factor(v) : 1.0f));
+								   (use_even_boundry    ? BM_vert_calc_shell_factor(v) : 1.0f));
 				madd_v3_v3v3fl(varr_co[i], v->co, v->no, fac);
 			}
 		}
diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c
index 818eedffc00..801fa2012cf 100644
--- a/source/blender/bmesh/operators/bmo_utils.c
+++ b/source/blender/bmesh/operators/bmo_utils.c
@@ -322,7 +322,7 @@ void bmo_righthandfaces_exec(BMesh *bm, BMOperator *op)
 
 		if (!startf) startf = f;
 
-		BM_face_center_bounds_calc(f, cent);
+		BM_face_calc_center_bounds(f, cent);
 
 		if ((maxx_test = dot_v3v3(cent, cent)) > maxx) {
 			maxx = maxx_test;
@@ -332,7 +332,7 @@ void bmo_righthandfaces_exec(BMesh *bm, BMOperator *op)
 
 	if (!startf) return;
 
-	BM_face_center_bounds_calc(startf, cent);
+	BM_face_calc_center_bounds(startf, cent);
 
 	/* make sure the starting face has the correct winding */
 	if (dot_v3v3(cent, startf->no) < 0.0f) {
@@ -473,7 +473,7 @@ static float ngon_fake_area(BMFace *f)
 	float   v[3], sv[3], c[3];
 	float   area = 0.0f;
 
-	BM_face_center_mean_calc(f, c);
+	BM_face_calc_center_mean(f, c);
 
 	BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
 		if (num_verts == 0) {
@@ -563,12 +563,12 @@ void bmo_similarfaces_exec(BMesh *bm, BMOperator *op)
 			switch (type) {
 				case SIMFACE_PERIMETER:
 					/* set the perimeter */
-					f_ext[i].perim = BM_face_perimeter_calc(f_ext[i].f);
+					f_ext[i].perim = BM_face_calc_perimeter(f_ext[i].f);
 					break;
 
 				case SIMFACE_COPLANAR:
 					/* compute the center of the polygon */
-					BM_face_center_mean_calc(f_ext[i].f, f_ext[i].c);
+					BM_face_calc_center_mean(f_ext[i].f, f_ext[i].c);
 
 					/* normalize the polygon normal */
 					copy_v3_v3(t_no, f_ext[i].f->no);
@@ -740,7 +740,7 @@ void bmo_similaredges_exec(BMesh *bm, BMOperator *op)
 				case SIMEDGE_FACE_ANGLE:
 					e_ext[i].faces = BM_edge_face_count(e_ext[i].e);
 					if (e_ext[i].faces == 2)
-						e_ext[i].angle = BM_edge_face_angle(e_ext[i].e);
+						e_ext[i].angle = BM_edge_calc_face_angle(e_ext[i].e);
 					break;
 			}
 		}