code cleanup:

use bmo_* prefix for operator defs, was confusing with bmesh_* api functions.

15 files changed, 73 insertions, 73 deletions

diff --git a/source/blender/bmesh/operators/bmo_bevel.c b/source/blender/bmesh/operators/bmo_bevel.c
index aab8d7d40dd..6cdea3657f6 100644
--- a/source/blender/bmesh/operators/bmo_bevel.c
+++ b/source/blender/bmesh/operators/bmo_bevel.c
@@ -172,7 +172,7 @@ static void calc_corner_co(BMesh *bm, BMLoop *l, const float fac, float r_co[3],
 		(etags[BM_elem_index_get((e))].newv2)                                 \
 	)
 
-void bmesh_bevel_exec(BMesh *bm, BMOperator *op)
+void bmo_bevel_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter iter;
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index ad15b703041..d2d4eaf8129 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -34,7 +34,7 @@
 #define EDGE_MARK	4
 #define EDGE_DONE	8
 
-void connectverts_exec(BMesh *bm, BMOperator *op)
+void bmo_connectverts_exec(BMesh *bm, BMOperator *op)
 {
 	BMIter iter, liter;
 	BMFace *f, *nf;
@@ -189,7 +189,7 @@ static void bm_vert_loop_pair(BMesh *bm, BMVert *v1, BMVert *v2, BMLoop **l1, BM
 	*l2 = BM_iter_at_index(bm, BM_LOOPS_OF_VERT, v2, 0);
 }
 
-void bmesh_bridge_loops_exec(BMesh *bm, BMOperator *op)
+void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op)
 {
 	BMEdge **ee1 = NULL, **ee2 = NULL;
 	BMVert **vv1 = NULL, **vv2 = NULL;
diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c
index 9136eccb6a7..5e9178c0a01 100644
--- a/source/blender/bmesh/operators/bmo_create.c
+++ b/source/blender/bmesh/operators/bmo_create.c
@@ -857,7 +857,7 @@ static int count_edge_faces(BMesh *bm, BMEdge *e)
 	return i;
 }
 
-void bmesh_edgenet_fill_exec(BMesh *bm, BMOperator *op)
+void bmo_edgenet_fill_exec(BMesh *bm, BMOperator *op)
 {
 	BMIter iter;
 	BMOIter siter;
@@ -1062,7 +1062,7 @@ static BMEdge *edge_next(BMesh *bm, BMEdge *e)
 	return NULL;
 }
 
-void bmesh_edgenet_prepare(BMesh *bm, BMOperator *op)
+void bmo_edgenet_prepare(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMEdge *e;
@@ -1242,7 +1242,7 @@ void bmesh_edgenet_prepare(BMesh *bm, BMOperator *op)
 }
 
 /* this is essentially new fke */
-void bmesh_contextual_create_exec(BMesh *bm, BMOperator *op)
+void bmo_contextual_create_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator op2;
 	BMOIter oiter;
@@ -1356,7 +1356,7 @@ void bmesh_contextual_create_exec(BMesh *bm, BMOperator *op)
 	BMO_op_finish(bm, &op2);
 	
 	/* now call dissolve face */
-	BMO_op_initf(bm, &op2, "dissolvefaces faces=%ff", ELE_NEW);
+	BMO_op_initf(bm, &op2, "dissolve_faces faces=%ff", ELE_NEW);
 	BMO_op_exec(bm, &op2);
 	
 	/* if we dissolved anything, then return */
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index 601399b9b96..4542b3fd917 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -68,7 +68,7 @@ static int UNUSED_FUNCTION(check_hole_in_region)(BMesh *bm, BMFace *f)
 	return TRUE;
 }
 
-void dissolvefaces_exec(BMesh *bm, BMOperator *op)
+void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter oiter;
 	BMFace *f, *f2 /* , *nf = NULL */;
@@ -185,7 +185,7 @@ cleanup:
 }
 
 /* almost identical to dissolve edge, except it cleans up vertice */
-void dissolve_edgeloop_exec(BMesh *bm, BMOperator *op)
+void bmo_dissolve_edgeloop_exec(BMesh *bm, BMOperator *op)
 {
 	/* BMOperator fop; */
 	BMOIter oiter;
@@ -222,7 +222,7 @@ void dissolve_edgeloop_exec(BMesh *bm, BMOperator *op)
 	
 	BLI_array_free(verts);
 
-	//BMO_op_initf(bm, &fop, "dissolvefaces faces=%ff", FACE_MARK);
+	//BMO_op_initf(bm, &fop, "dissolve_faces faces=%ff", FACE_MARK);
 	//BMO_op_exec(bm, &fop);
 
 	//BMO_slot_copy(op, &fop, "regionout", "regionout");
@@ -231,7 +231,7 @@ void dissolve_edgeloop_exec(BMesh *bm, BMOperator *op)
 }
 
 
-void dissolveedges_exec(BMesh *bm, BMOperator *op)
+void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op)
 {
 	/* might want to make this an option or mode - campbell */
 
@@ -317,7 +317,7 @@ static int test_extra_verts(BMesh *bm, BMVert *v)
 
 	return TRUE;
 }
-void dissolveverts_exec(BMesh *bm, BMOperator *op)
+void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op)
 {
 	BMOpSlot *vinput;
 	BMIter iter, fiter;
@@ -371,7 +371,7 @@ void dissolveverts_exec(BMesh *bm, BMOperator *op)
 		}
 	}
 
-	BMO_op_callf(bm, "dissolvefaces faces=%ff", FACE_MARK);
+	BMO_op_callf(bm, "dissolve_faces faces=%ff", FACE_MARK);
 	if (BMO_error_occurred(bm)) {
 		const char *msg;
 
@@ -477,7 +477,7 @@ static int dissolve_elem_cmp(const void *a1, const void *a2)
 	return 0;
 }
 
-void dissolvelimit_exec(BMesh *bm, BMOperator *op)
+void bmo_dissolve_limit_exec(BMesh *bm, BMOperator *op)
 {
 	BMOpSlot *einput = BMO_slot_get(op, "edges");
 	BMOpSlot *vinput = BMO_slot_get(op, "verts");
diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c
index 09b0e2042f4..20f1920c07f 100644
--- a/source/blender/bmesh/operators/bmo_dupe.c
+++ b/source/blender/bmesh/operators/bmo_dupe.c
@@ -316,7 +316,7 @@ static void copy_mesh(BMOperator *op, BMesh *source, BMesh *target)
  *
  */
 
-void dupeop_exec(BMesh *bm, BMOperator *op)
+void bmo_dupe_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator *dupeop = op;
 	BMesh *bm2 = BMO_slot_ptr_get(op, "dest");
@@ -374,7 +374,7 @@ void BMO_dupe_from_flag(BMesh *bm, int etypeflag, const char hflag)
  */
 
 #define SPLIT_INPUT	1
-void splitop_exec(BMesh *bm, BMOperator *op)
+void bmo_split_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator *splitop = op;
 	BMOperator dupeop;
@@ -446,7 +446,7 @@ void splitop_exec(BMesh *bm, BMOperator *op)
 }
 
 
-void delop_exec(BMesh *bm, BMOperator *op)
+void bmo_del_exec(BMesh *bm, BMOperator *op)
 {
 #define DEL_INPUT 1
 
@@ -467,7 +467,7 @@ void delop_exec(BMesh *bm, BMOperator *op)
  * rotating and possibly translating after each step
  */
 
-void spinop_exec(BMesh *bm, BMOperator *op)
+void bmo_spin_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator dupop, extop;
 	float cent[3], dvec[3];
@@ -504,7 +504,7 @@ void spinop_exec(BMesh *bm, BMOperator *op)
 			BMO_op_finish(bm, &dupop);
 		}
 		else {
-			BMO_op_initf(bm, &extop, "extrudefaceregion edgefacein=%s",
+			BMO_op_initf(bm, &extop, "extrude_face_region edgefacein=%s",
 			             op, "lastout");
 			BMO_op_exec(bm, &extop);
 			BMO_op_callf(bm, "rotate cent=%v mat=%m3 verts=%s",
diff --git a/source/blender/bmesh/operators/bmo_edgesplit.c b/source/blender/bmesh/operators/bmo_edgesplit.c
index f8c41d71558..59d0c1f1e1b 100644
--- a/source/blender/bmesh/operators/bmo_edgesplit.c
+++ b/source/blender/bmesh/operators/bmo_edgesplit.c
@@ -195,7 +195,7 @@ static void tag_out_edges(BMesh *bm, EdgeTag *etags, BMOperator *UNUSED(op))
 	}
 }
 
-void bmesh_edgesplitop_exec(BMesh *bm, BMOperator *op)
+void bmo_edgesplit_exec(BMesh *bm, BMOperator *op)
 {
 	EdgeTag *etags, *et;
 	BMIter iter, liter;
diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c
index b194428deba..7425d20bd88 100644
--- a/source/blender/bmesh/operators/bmo_extrude.c
+++ b/source/blender/bmesh/operators/bmo_extrude.c
@@ -39,7 +39,7 @@
 #define VERT_NONMAN 2
 #define EDGE_NONMAN 2
 
-void bmesh_extrude_face_indiv_exec(BMesh *bm, BMOperator *op)
+void bmo_extrude_face_indiv_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter liter, liter2;
@@ -111,7 +111,7 @@ void bmesh_extrude_face_indiv_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "faceout", EXT_KEEP, BM_FACE);
 }
 
-void bmesh_extrude_onlyedge_exec(BMesh *bm, BMOperator *op)
+void bmo_extrude_edge_only_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMOperator dupeop;
@@ -163,7 +163,7 @@ void bmesh_extrude_onlyedge_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "geomout", EXT_KEEP, BM_ALL);
 }
 
-void extrude_vert_indiv_exec(BMesh *bm, BMOperator *op)
+void bmo_extrude_vert_indiv_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMVert *v, *dupev;
@@ -183,7 +183,7 @@ void extrude_vert_indiv_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "edgeout", EXT_KEEP, BM_EDGE);
 }
 
-void extrude_edge_context_exec(BMesh *bm, BMOperator *op)
+void bmo_extrude_face_region_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator dupeop, delop;
 	BMOIter siter;
@@ -564,7 +564,7 @@ static void solidify_add_thickness(BMesh *bm, float dist)
 	MEM_freeN(vert_angles);
 }
 
-void bmesh_solidify_face_region_exec(BMesh *bm, BMOperator *op)
+void bmo_solidify_face_region_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator extrudeop;
 	BMOperator reverseop;
@@ -579,7 +579,7 @@ void bmesh_solidify_face_region_exec(BMesh *bm, BMOperator *op)
 	BMO_op_finish(bm, &reverseop);
 
 	/* Extrude the region */
-	BMO_op_initf(bm, &extrudeop, "extrudefaceregion alwayskeeporig=%b", TRUE);
+	BMO_op_initf(bm, &extrudeop, "extrude_face_region alwayskeeporig=%b", TRUE);
 	BMO_slot_copy(op, &extrudeop, "geom", "edgefacein");
 	BMO_op_exec(bm, &extrudeop);
 
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c
index 5ece4b60c4e..76e64aee821 100644
--- a/source/blender/bmesh/operators/bmo_join_triangles.c
+++ b/source/blender/bmesh/operators/bmo_join_triangles.c
@@ -222,7 +222,7 @@ static int fplcmp(const void *v1, const void *v2)
 	return 0;
 }
 
-void bmesh_jointriangles_exec(BMesh *bm, BMOperator *op)
+void bmo_join_triangles_exec(BMesh *bm, BMOperator *op)
 {
 	BMIter iter, liter;
 	BMOIter siter;
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index b41a6f823b0..93ddee602c9 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -52,7 +52,7 @@
  *
  */
 
-void mesh_to_bmesh_exec(BMesh *bm, BMOperator *op)
+void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op)
 {
 	Object *ob = BMO_slot_ptr_get(op, "object");
 	Mesh *me = BMO_slot_ptr_get(op, "mesh");
@@ -364,7 +364,7 @@ void mesh_to_bmesh_exec(BMesh *bm, BMOperator *op)
 	MEM_freeN(et);
 }
 
-void object_load_bmesh_exec(BMesh *bm, BMOperator *op)
+void bmo_object_load_bmesh_exec(BMesh *bm, BMOperator *op)
 {
 	Object *ob = BMO_slot_ptr_get(op, "object");
 	/* Scene *scene = BMO_slot_ptr_get(op, "scene"); */
@@ -433,7 +433,7 @@ BM_INLINE void bmesh_quick_edgedraw_flag(MEdge *med, BMEdge *e)
 }
 
 
-void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op)
+void bmo_bmesh_to_mesh_exec(BMesh *bm, BMOperator *op)
 {
 	Mesh *me = BMO_slot_ptr_get(op, "mesh");
 	/* Object *ob = BMO_slot_ptr_get(op, "object"); */
diff --git a/source/blender/bmesh/operators/bmo_mirror.c b/source/blender/bmesh/operators/bmo_mirror.c
index 128b64b08de..7990e991431 100644
--- a/source/blender/bmesh/operators/bmo_mirror.c
+++ b/source/blender/bmesh/operators/bmo_mirror.c
@@ -34,7 +34,7 @@
 
 #define ELE_NEW		1
 
-void bmesh_mirror_exec(BMesh *bm, BMOperator *op)
+void bmo_mirror_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator dupeop, weldop;
 	BMOIter siter;
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index a050f04078e..09f815f50d5 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -223,7 +223,7 @@ static signed char monkeyf[250][4] = {
 #define FACE_MARK	1
 #define FACE_NEW	2
 
-void bmesh_create_grid_exec(BMesh *bm, BMOperator *op)
+void bmo_create_grid_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator bmop, prevop;
 	BMVert *eve, *preveve;
@@ -286,7 +286,7 @@ void bmesh_create_grid_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT);
 }
 
-void bmesh_create_uvsphere_exec(BMesh *bm, BMOperator *op)
+void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator bmop, prevop;
 	BMVert *eve, *preveve;
@@ -375,7 +375,7 @@ void bmesh_create_uvsphere_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT);
 }
 
-void bmesh_create_icosphere_exec(BMesh *bm, BMOperator *op)
+void bmo_create_icosphere_exec(BMesh *bm, BMOperator *op)
 {
 	BMVert *eva[12];
 	BMVert *v;
@@ -442,7 +442,7 @@ void bmesh_create_icosphere_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT);
 }
 
-void bmesh_create_monkey_exec(BMesh *bm, BMOperator *op)
+void bmo_create_monkey_exec(BMesh *bm, BMOperator *op)
 {
 	BMVert *eve;
 	BMVert **tv = MEM_mallocN(sizeof(*tv)*monkeynv * 2, "tv");
@@ -490,7 +490,7 @@ void bmesh_create_monkey_exec(BMesh *bm, BMOperator *op)
 }
 
 
-void bmesh_create_circle_exec(BMesh *bm, BMOperator *op)
+void bmo_create_circle_exec(BMesh *bm, BMOperator *op)
 {
 	BMVert *v1, *lastv1 = NULL, *cent1, *firstv1 = NULL;
 	float vec[3], mat[4][4], phi, phid;
@@ -555,13 +555,13 @@ void bmesh_create_circle_exec(BMesh *bm, BMOperator *op)
 	}
 	
 	if (!cap_tris) {
-		BMO_op_callf(bm, "dissolvefaces faces=%ff", FACE_NEW);
+		BMO_op_callf(bm, "dissolve_faces faces=%ff", FACE_NEW);
 	}
 	
 	BMO_slot_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT);
 }
 
-void bmesh_create_cone_exec(BMesh *bm, BMOperator *op)
+void bmo_create_cone_exec(BMesh *bm, BMOperator *op)
 {
 	BMVert *v1, *v2, *lastv1 = NULL, *lastv2 = NULL, *cent1, *cent2, *firstv1, *firstv2;
 	float vec[3], mat[4][4], phi, phid;
@@ -648,7 +648,7 @@ void bmesh_create_cone_exec(BMesh *bm, BMOperator *op)
 	}
 	
 	if (!cap_tris) {
-		BMO_op_callf(bm, "dissolvefaces faces=%ff", FACE_NEW);
+		BMO_op_callf(bm, "dissolve_faces faces=%ff", FACE_NEW);
 	}
 	
 	BM_face_create_quad_tri(bm, v1, v2, firstv2, firstv1, NULL, FALSE);
@@ -657,7 +657,7 @@ void bmesh_create_cone_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "vertout", VERT_MARK, BM_VERT);
 }
 
-void bmesh_create_cube_exec(BMesh *bm, BMOperator *op)
+void bmo_create_cube_exec(BMesh *bm, BMOperator *op)
 {
 	BMVert *v1, *v2, *v3, *v4, *v5, *v6, *v7, *v8;
 	float vec[3], mat[4][4], off = BMO_slot_float_get(op, "size") / 2.0f;
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index 35fc6a1eadf..fbc247abe4f 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -92,7 +92,7 @@ int remdoubles_face_overlaps(BMesh *bm, BMVert **varr,
 }
 #endif
 
-void bmesh_weldverts_exec(BMesh *bm, BMOperator *op)
+void bmo_weldverts_exec(BMesh *bm, BMOperator *op)
 {
 	BMIter iter, liter;
 	BMVert *v, *v2;
@@ -244,7 +244,7 @@ static int vergaverco(const void *e1, const void *e2)
 
 #define EDGE_MARK	1
 
-void bmesh_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
+void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter iter;
@@ -292,7 +292,7 @@ void bmesh_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
 	}
 }
 
-void bmesh_vert_average_facedata_exec(BMesh *bm, BMOperator *op)
+void bmo_vert_average_facedata_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter iter;
@@ -329,7 +329,7 @@ void bmesh_vert_average_facedata_exec(BMesh *bm, BMOperator *op)
 	}
 }
 
-void bmesh_pointmerge_exec(BMesh *bm, BMOperator *op)
+void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator weldop;
 	BMOIter siter;
@@ -355,7 +355,7 @@ void bmesh_pointmerge_exec(BMesh *bm, BMOperator *op)
 	BMO_op_finish(bm, &weldop);
 }
 
-void bmesh_collapse_exec(BMesh *bm, BMOperator *op)
+void bmo_collapse_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator weldop;
 	BMWalker walker;
@@ -466,7 +466,7 @@ static void bmesh_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer)
 	BLI_array_free(blocks);
 }
 
-void bmesh_collapsecon_exec(BMesh *bm, BMOperator *op)
+void bmo_collapse_uvs_exec(BMesh *bm, BMOperator *op)
 {
 	int i;
 
@@ -544,7 +544,7 @@ void bmesh_finddoubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, c
 	BLI_array_free(verts);
 }
 
-void bmesh_removedoubles_exec(BMesh *bm, BMOperator *op)
+void bmo_removedoubles_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator weldop;
 
@@ -555,12 +555,12 @@ void bmesh_removedoubles_exec(BMesh *bm, BMOperator *op)
 }
 
 
-void bmesh_finddoubles_exec(BMesh *bm, BMOperator *op)
+void bmo_finddoubles_exec(BMesh *bm, BMOperator *op)
 {
 	bmesh_finddoubles_common(bm, op, op, "targetmapout");
 }
 
-void bmesh_automerge_exec(BMesh *bm, BMOperator *op)
+void bmo_automerge_exec(BMesh *bm, BMOperator *op)
 {
 	BMOperator findop, weldop;
 	BMIter viter;
diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c
index efbb31d9cb3..c5d370b390a 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.c
+++ b/source/blender/bmesh/operators/bmo_subdivide.c
@@ -665,7 +665,7 @@ typedef struct subd_facedata {
 	BMFace *face;
 } subd_facedata;
 
-void esubdivide_exec(BMesh *bmesh, BMOperator *op)
+void bmo_esubd_exec(BMesh *bmesh, BMOperator *op)
 {
 	BMOpSlot *einput;
 	SubDPattern *pat;
@@ -1078,7 +1078,7 @@ void BM_mesh_esubdivideflag(Object *UNUSED(obedit), BMesh *bm, int flag, float s
 	BMO_op_finish(bm, &op);
 }
 
-void esplit_exec(BMesh *bm, BMOperator *op)
+void bmo_edgebisect_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMEdge *e;
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index b4ec3d740d4..b3f4fefa36e 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -39,7 +39,7 @@
 #define FACE_MARK	2
 #define EDGE_MARK	4
 
-void triangulate_exec(BMesh *bm, BMOperator *op)
+void bmo_triangulate_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMFace *face, **newfaces = NULL;
@@ -78,7 +78,7 @@ void triangulate_exec(BMesh *bm, BMOperator *op)
 	BLI_array_free(newfaces);
 }
 
-void bmesh_beautify_fill_exec(BMesh *bm, BMOperator *op)
+void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter iter;
@@ -154,7 +154,7 @@ void bmesh_beautify_fill_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "geomout", ELE_NEW, BM_EDGE|BM_FACE);
 }
 
-void bmesh_triangle_fill_exec(BMesh *bm, BMOperator *op)
+void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMEdge *e;
diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c
index b3102d7fafc..cf950616471 100644
--- a/source/blender/bmesh/operators/bmo_utils.c
+++ b/source/blender/bmesh/operators/bmo_utils.c
@@ -42,7 +42,7 @@
  *
  */
 
-void bmesh_makevert_exec(BMesh *bm, BMOperator *op)
+void bmo_makevert_exec(BMesh *bm, BMOperator *op)
 {
 	float vec[3];
 
@@ -52,7 +52,7 @@ void bmesh_makevert_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_from_flag(bm, op, "newvertout", 1, BM_VERT);
 }
 
-void bmesh_transform_exec(BMesh *bm, BMOperator *op)
+void bmo_transform_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter iter;
 	BMVert *v;
@@ -65,7 +65,7 @@ void bmesh_transform_exec(BMesh *bm, BMOperator *op)
 	}
 }
 
-void bmesh_translate_exec(BMesh *bm, BMOperator *op)
+void bmo_translate_exec(BMesh *bm, BMOperator *op)
 {
 	float mat[4][4], vec[3];
 	
@@ -77,7 +77,7 @@ void bmesh_translate_exec(BMesh *bm, BMOperator *op)
 	BMO_op_callf(bm, "transform mat=%m4 verts=%s", mat, op, "verts");
 }
 
-void bmesh_scale_exec(BMesh *bm, BMOperator *op)
+void bmo_scale_exec(BMesh *bm, BMOperator *op)
 {
 	float mat[3][3], vec[3];
 	
@@ -91,7 +91,7 @@ void bmesh_scale_exec(BMesh *bm, BMOperator *op)
 	BMO_op_callf(bm, "transform mat=%m3 verts=%s", mat, op, "verts");
 }
 
-void bmesh_rotate_exec(BMesh *bm, BMOperator *op)
+void bmo_rotate_exec(BMesh *bm, BMOperator *op)
 {
 	float vec[3];
 	
@@ -109,7 +109,7 @@ void bmesh_rotate_exec(BMesh *bm, BMOperator *op)
 	BMO_op_callf(bm, "translate verts=%s vec=%v", op, "verts", vec);
 }
 
-void bmesh_reversefaces_exec(BMesh *bm, BMOperator *op)
+void bmo_reversefaces_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMFace *f;
@@ -119,7 +119,7 @@ void bmesh_reversefaces_exec(BMesh *bm, BMOperator *op)
 	}
 }
 
-void bmesh_edgerotate_exec(BMesh *bm, BMOperator *op)
+void bmo_edgerotate_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMEdge *e, *e2;
@@ -221,7 +221,7 @@ static void bmesh_regionextend_constrict(BMesh *bm, BMOperator *op, int usefaces
 	}
 }
 
-void bmesh_regionextend_exec(BMesh *bm, BMOperator *op)
+void bmo_regionextend_exec(BMesh *bm, BMOperator *op)
 {
 	int use_faces = BMO_slot_bool_get(op, "use_faces");
 	int constrict = BMO_slot_bool_get(op, "constrict");
@@ -264,7 +264,7 @@ void bmesh_regionextend_exec(BMesh *bm, BMOperator *op)
 
 /* NOTE: BM_ELEM_TAG is used on faces to tell if they are flipped. */
 
-void bmesh_righthandfaces_exec(BMesh *bm, BMOperator *op)
+void bmo_righthandfaces_exec(BMesh *bm, BMOperator *op)
 {
 	BMIter liter, liter2;
 	BMOIter siter;
@@ -365,13 +365,13 @@ void bmesh_righthandfaces_exec(BMesh *bm, BMOperator *op)
 	/* check if we have faces yet to do.  if so, recurse */
 	BMO_ITER(f, &siter, bm, op, "faces", BM_FACE) {
 		if (!BMO_elem_flag_test(bm, f, FACE_VIS)) {
-			bmesh_righthandfaces_exec(bm, op);
+			bmo_righthandfaces_exec(bm, op);
 			break;
 		}
 	}
 }
 
-void bmesh_vertexsmooth_exec(BMesh *bm, BMOperator *op)
+void bmo_vertexsmooth_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter siter;
 	BMIter iter;
@@ -509,7 +509,7 @@ typedef struct tmp_face_ext {
  * Select similar faces, the choices are in the enum in source/blender/bmesh/bmesh_operators.h
  * We select either similar faces based on material, image, area, perimeter, normal, or the coplanar faces
  */
-void bmesh_similarfaces_exec(BMesh *bm, BMOperator *op)
+void bmo_similarfaces_exec(BMesh *bm, BMOperator *op)
 {
 	BMIter fm_iter;
 	BMFace *fs, *fm;
@@ -702,7 +702,7 @@ typedef struct tmp_edge_ext {
  * select similar edges: the choices are in the enum in source/blender/bmesh/bmesh_operators.h
  * choices are length, direction, face, ...
  */
-void bmesh_similaredges_exec(BMesh *bm, BMOperator *op)
+void bmo_similaredges_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter es_iter;	/* selected edges iterator */
 	BMIter	e_iter;		/* mesh edges iterator */
@@ -870,7 +870,7 @@ typedef struct tmp_vert_ext {
  * select similar vertices: the choices are in the enum in source/blender/bmesh/bmesh_operators.h
  * choices are normal, face, vertex group...
  */
-void bmesh_similarverts_exec(BMesh *bm, BMOperator *op)
+void bmo_similarverts_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter vs_iter;	/* selected verts iterator */
 	BMIter v_iter;		/* mesh verts iterator */
@@ -973,7 +973,7 @@ void bmesh_similarverts_exec(BMesh *bm, BMOperator *op)
 ** Cycle UVs for a face
 **************************************************************************** */
 
-void bmesh_rotateuvs_exec(BMesh *bm, BMOperator *op)
+void bmo_face_rotateuvs_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter fs_iter;	/* selected faces iterator */
 	BMFace *fs;	/* current face */
@@ -1040,7 +1040,7 @@ void bmesh_rotateuvs_exec(BMesh *bm, BMOperator *op)
 ** Reverse UVs for a face
 **************************************************************************** */
 
-void bmesh_reverseuvs_exec(BMesh *bm, BMOperator *op)
+void bmo_face_reverseuvs_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter fs_iter;	/* selected faces iterator */
 	BMFace *fs;		/* current face */
@@ -1083,7 +1083,7 @@ void bmesh_reverseuvs_exec(BMesh *bm, BMOperator *op)
 ** Cycle colors for a face
 **************************************************************************** */
 
-void bmesh_rotatecolors_exec(BMesh *bm, BMOperator *op)
+void bmo_rotatecolors_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter fs_iter;	/* selected faces iterator */
 	BMFace *fs;	/* current face */
@@ -1149,7 +1149,7 @@ void bmesh_rotatecolors_exec(BMesh *bm, BMOperator *op)
 ** Reverse colors for a face
 **************************************************************************** */
 
-void bmesh_reversecolors_exec(BMesh *bm, BMOperator *op)
+void bmo_face_reversecolors_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter fs_iter;	/* selected faces iterator */
 	BMFace *fs;		/* current face */
@@ -1198,7 +1198,7 @@ typedef struct element_node {
 	HeapNode *hn;	/* heap node */
 } element_node;
 
-void bmesh_vertexshortestpath_exec(BMesh *bm, BMOperator *op)
+void bmo_vertexshortestpath_exec(BMesh *bm, BMOperator *op)
 {
 	BMOIter vs_iter /* , vs2_iter */;	/* selected verts iterator */
 	BMIter v_iter;		/* mesh verts iterator */