op names change

4 files changed, 46 insertions, 46 deletions

diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index 6b6cec08e9e..57fb2c19c75 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -797,11 +797,11 @@ static int addedgeface_mesh_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void MESH_OT_add_edge_face(wmOperatorType *ot)
+void MESH_OT_edge_face_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Make Edge/Face";
-	ot->idname= "MESH_OT_add_edge_face";
+	ot->idname= "MESH_OT_edge_face_add";
 	
 	/* api callbacks */
 	ot->exec= addedgeface_mesh_exec;
@@ -1321,11 +1321,11 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_plane(wmOperatorType *ot)
+void MESH_OT_primitive_plane_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Plane";
-	ot->idname= "MESH_OT_add_primitive_plane";
+	ot->idname= "MESH_OT_primitive_plane_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_plane_exec;
@@ -1351,11 +1351,11 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_cube(wmOperatorType *ot)
+void MESH_OT_primitive_cube_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Cube";
-	ot->idname= "MESH_OT_add_primitive_cube";
+	ot->idname= "MESH_OT_primitive_cube_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_cube_exec;
@@ -1381,11 +1381,11 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_circle(wmOperatorType *ot)
+void MESH_OT_primitive_circle_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Circle";
-	ot->idname= "MESH_OT_add_primitive_circle";
+	ot->idname= "MESH_OT_primitive_circle_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_circle_exec;
@@ -1416,11 +1416,11 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_cylinder(wmOperatorType *ot)
+void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Cylinder";
-	ot->idname= "MESH_OT_add_primitive_cylinder";
+	ot->idname= "MESH_OT_primitive_cylinder_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_cylinder_exec;
@@ -1451,11 +1451,11 @@ static int add_primitive_tube_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_tube(wmOperatorType *ot)
+void MESH_OT_primitive_tube_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Tube";
-	ot->idname= "MESH_OT_add_primitive_tube";
+	ot->idname= "MESH_OT_primitive_tube_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_tube_exec;
@@ -1486,11 +1486,11 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_cone(wmOperatorType *ot)
+void MESH_OT_primitive_cone_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Cone";
-	ot->idname= "MESH_OT_add_primitive_cone";
+	ot->idname= "MESH_OT_primitive_cone_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_cone_exec;
@@ -1523,11 +1523,11 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_grid(wmOperatorType *ot)
+void MESH_OT_primitive_grid_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Grid";
-	ot->idname= "MESH_OT_add_primitive_grid";
+	ot->idname= "MESH_OT_primitive_grid_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_grid_exec;
@@ -1556,11 +1556,11 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_monkey(wmOperatorType *ot)
+void MESH_OT_primitive_monkey_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Monkey";
-	ot->idname= "MESH_OT_add_primitive_monkey";
+	ot->idname= "MESH_OT_primitive_monkey_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_monkey_exec;
@@ -1586,11 +1586,11 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_uv_sphere(wmOperatorType *ot)
+void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add UV Sphere";
-	ot->idname= "MESH_OT_add_primitive_uv_sphere";
+	ot->idname= "MESH_OT_primitive_uv_sphere_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_uvsphere_exec;
@@ -1621,11 +1621,11 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;	
 }
 
-void MESH_OT_add_primitive_ico_sphere(wmOperatorType *ot)
+void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name= "Add Ico Sphere";
-	ot->idname= "MESH_OT_add_primitive_ico_sphere";
+	ot->idname= "MESH_OT_primitive_ico_sphere_add";
 	
 	/* api callbacks */
 	ot->exec= add_primitive_icosphere_exec;
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index c21e579b030..fe32e7b2568 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -4266,7 +4266,7 @@ static int smooth_vertex(bContext *C, wmOperator *op)
 	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	Mesh *me= obedit->data;
-	EditMesh *em= me; 
+	EditMesh *em= (EditMesh *)me; 
 
 	EditVert *eve, *eve_mir = NULL;
 	EditEdge *eed;
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index 24e3a3cc4bf..87ec6478009 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -72,18 +72,18 @@ void em_setup_viewcontext(struct bContext *C, ViewContext *vc);
 void MESH_OT_separate(struct wmOperatorType *ot);
 
 /* ******************* editmesh_add.c */
-void MESH_OT_add_primitive_plane(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_cube(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_circle(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_cylinder(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_tube(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_cone(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_grid(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_monkey(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_uv_sphere(struct wmOperatorType *ot);
-void MESH_OT_add_primitive_ico_sphere(struct wmOperatorType *ot);
+void MESH_OT_primitive_plane_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_cube_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_circle_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_cylinder_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_tube_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_cone_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_grid_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_monkey_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_uv_sphere_add(struct wmOperatorType *ot);
+void MESH_OT_primitive_ico_sphere_add(struct wmOperatorType *ot);
 void MESH_OT_dupli_extrude_cursor(struct wmOperatorType *ot);
-void MESH_OT_add_edge_face(struct wmOperatorType *ot);
+void MESH_OT_edge_face_add(struct wmOperatorType *ot);
 
 void MESH_OT_fgon_make(struct wmOperatorType *ot);
 void MESH_OT_fgon_clear(struct wmOperatorType *ot);
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index 5be27ab0f8f..45a7f4a32fe 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -126,16 +126,16 @@ void ED_operatortypes_mesh(void)
 	WM_operatortype_append(MESH_OT_subdivs);
 	WM_operatortype_append(MESH_OT_select_linked_flat_faces);
 	WM_operatortype_append(MESH_OT_select_sharp_edges);
-	WM_operatortype_append(MESH_OT_add_primitive_plane);
-	WM_operatortype_append(MESH_OT_add_primitive_cube);
-	WM_operatortype_append(MESH_OT_add_primitive_circle);
-	WM_operatortype_append(MESH_OT_add_primitive_cylinder);
-	WM_operatortype_append(MESH_OT_add_primitive_tube);
-	WM_operatortype_append(MESH_OT_add_primitive_cone);
-	WM_operatortype_append(MESH_OT_add_primitive_grid);
-	WM_operatortype_append(MESH_OT_add_primitive_monkey);
-	WM_operatortype_append(MESH_OT_add_primitive_uv_sphere);
-	WM_operatortype_append(MESH_OT_add_primitive_ico_sphere);
+	WM_operatortype_append(MESH_OT_primitive_plane_add);
+	WM_operatortype_append(MESH_OT_primitive_cube_add);
+	WM_operatortype_append(MESH_OT_primitive_circle_add);
+	WM_operatortype_append(MESH_OT_primitive_cylinder_add);
+	WM_operatortype_append(MESH_OT_primitive_tube_add);
+	WM_operatortype_append(MESH_OT_primitive_cone_add);
+	WM_operatortype_append(MESH_OT_primitive_grid_add);
+	WM_operatortype_append(MESH_OT_primitive_monkey_add);
+	WM_operatortype_append(MESH_OT_primitive_uv_sphere_add);
+	WM_operatortype_append(MESH_OT_primitive_ico_sphere_add);
 	WM_operatortype_append(MESH_OT_fgon_clear);
 	WM_operatortype_append(MESH_OT_fgon_make);
 	WM_operatortype_append(MESH_OT_duplicate_add);
@@ -169,7 +169,7 @@ void ED_operatortypes_mesh(void)
 	WM_operatortype_append(MESH_OT_separate);
 	WM_operatortype_append(MESH_OT_dupli_extrude_cursor);
 	WM_operatortype_append(MESH_OT_select_loop);
-	WM_operatortype_append(MESH_OT_add_edge_face);
+	WM_operatortype_append(MESH_OT_edge_face_add);
 	WM_operatortype_append(MESH_OT_select_path_shortest);
 	WM_operatortype_append(MESH_OT_select_vertex_similar);
 	WM_operatortype_append(MESH_OT_select_edge_similar);
@@ -275,7 +275,7 @@ void ED_keymap_mesh(wmWindowManager *wm)
 	WM_keymap_add_item(keymap, "MESH_OT_rip",VKEY, KM_PRESS, 0, 0);
 
 	/* add/remove */
-	WM_keymap_add_item(keymap, "MESH_OT_add_edge_face", FKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MESH_OT_edge_face_add", FKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_duplicate_add", DKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "OBJECT_OT_mesh_add", AKEY, KM_PRESS, KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_separate", PKEY, KM_PRESS, KM_SHIFT, 0);