editmesh_tools.c op name change
authorShaul Kedem <shaul_kedem@yahoo.com>
Sun, 12 Apr 2009 17:54:07 +0000 (17:54 +0000)
committerShaul Kedem <shaul_kedem@yahoo.com>
Sun, 12 Apr 2009 17:54:07 +0000 (17:54 +0000)
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/space_view3d/view3d_header.c

index e6d156a41b89f5b536c413e6792ac03912a40d55..5ce86a7eb872bad897ae0937795be1ed32f7bfb2 100644 (file)
@@ -504,11 +504,11 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;       
 }
 
-void MESH_OT_remove_doubles(wmOperatorType *ot)
+void MESH_OT_doubles_remove(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Remove Doubles";
-       ot->idname= "MESH_OT_remove_doubles";
+       ot->idname= "MESH_OT_doubles_remove";
        
        /* api callbacks */
        ot->exec= removedoublesflag_exec;
@@ -6409,11 +6409,11 @@ static int mesh_mirror_colors(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-void MESH_OT_rotate_uvs(wmOperatorType *ot)
+void MESH_OT_uvs_rotate(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Rotate UVs";
-       ot->idname= "MESH_OT_rotate_uvs";
+       ot->idname= "MESH_OT_uvs_rotate";
        
        /* api callbacks */
        ot->exec= mesh_rotate_uvs;
@@ -6423,11 +6423,11 @@ void MESH_OT_rotate_uvs(wmOperatorType *ot)
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-void MESH_OT_mirror_uvs(wmOperatorType *ot)
+void MESH_OT_uvs_mirror(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Mirror UVs";
-       ot->idname= "MESH_OT_mirror_uvs";
+       ot->idname= "MESH_OT_uvs_mirror";
        
        /* api callbacks */
        ot->exec= mesh_mirror_uvs;
@@ -6437,11 +6437,11 @@ void MESH_OT_mirror_uvs(wmOperatorType *ot)
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-void MESH_OT_rotate_colors(wmOperatorType *ot)
+void MESH_OT_colors_rotate(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Rotate Colors";
-       ot->idname= "MESH_OT_rotate_colors";
+       ot->idname= "MESH_OT_colors_rotate";
        
        /* api callbacks */
        ot->exec= mesh_rotate_colors;
@@ -6451,11 +6451,11 @@ void MESH_OT_rotate_colors(wmOperatorType *ot)
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-void MESH_OT_mirror_colors(wmOperatorType *ot)
+void MESH_OT_colors_mirror(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Mirror Colors";
-       ot->idname= "MESH_OT_mirror_colors";
+       ot->idname= "MESH_OT_colors_mirror";
        
        /* api callbacks */
        ot->exec= mesh_mirror_colors;
@@ -6967,11 +6967,11 @@ static int convert_quads_to_tris_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-void MESH_OT_convert_quads_to_tris(wmOperatorType *ot)
+void MESH_OT_quads_to_tris_convert(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Quads to Tris";
-       ot->idname= "MESH_OT_convert_quads_to_tris";
+       ot->idname= "MESH_OT_quads_to_tris_convert";
        
        /* api callbacks */
        ot->exec= convert_quads_to_tris_exec;
@@ -6994,11 +6994,11 @@ static int convert_tris_to_quads_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-void MESH_OT_convert_tris_to_quads(wmOperatorType *ot)
+void MESH_OT_tris_to_quads_convert(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Tris to Quads";
-       ot->idname= "MESH_OT_convert_tris_to_quads";
+       ot->idname= "MESH_OT_tris_to_quads_convert";
        
        /* api callbacks */
        ot->exec= convert_tris_to_quads_exec;
index 02159b9a40b45cf889ef58f9b777dc78eacbdb01..0ea410a627986807eb6b24c82d6c40bd62f7ed54 100644 (file)
@@ -207,15 +207,15 @@ void MESH_OT_subdivs(struct wmOperatorType *ot);
 void MESH_OT_subdivide_multi(struct wmOperatorType *ot);
 void MESH_OT_subdivide_multi_fractal(struct wmOperatorType *ot);
 void MESH_OT_subdivide_smooth(struct wmOperatorType *ot);
-void MESH_OT_remove_doubles(struct wmOperatorType *ot);
+void MESH_OT_doubles_remove(struct wmOperatorType *ot);
 void MESH_OT_extrude(struct wmOperatorType *ot);
 void MESH_OT_spin(struct wmOperatorType *ot);
 void MESH_OT_screw(struct wmOperatorType *ot);
 
 void MESH_OT_fill(struct wmOperatorType *ot);
 void MESH_OT_beauty_fill(struct wmOperatorType *ot);
-void MESH_OT_convert_quads_to_tris(struct wmOperatorType *ot);
-void MESH_OT_convert_tris_to_quads(struct wmOperatorType *ot);
+void MESH_OT_quads_to_tris_convert(struct wmOperatorType *ot);
+void MESH_OT_tris_to_quads_convert(struct wmOperatorType *ot);
 void MESH_OT_edge_flip(struct wmOperatorType *ot);
 void MESH_OT_faces_shade_smooth(struct wmOperatorType *ot);
 void MESH_OT_faces_shade_solid(struct wmOperatorType *ot);
@@ -225,10 +225,10 @@ void MESH_OT_edge_rotate(struct wmOperatorType *ot);
 void MESH_OT_loop_to_region(struct wmOperatorType *ot);
 void MESH_OT_region_to_loop(struct wmOperatorType *ot);
 
-void MESH_OT_rotate_uvs(struct wmOperatorType *ot);
-void MESH_OT_mirror_uvs(struct wmOperatorType *ot);
-void MESH_OT_rotate_colors(struct wmOperatorType *ot);
-void MESH_OT_mirror_colors(struct wmOperatorType *ot);
+void MESH_OT_uvs_rotate(struct wmOperatorType *ot);
+void MESH_OT_uvs_mirror(struct wmOperatorType *ot);
+void MESH_OT_colors_rotate(struct wmOperatorType *ot);
+void MESH_OT_colors_mirror(struct wmOperatorType *ot);
 
 void MESH_OT_delete(struct wmOperatorType *ot);
 void MESH_OT_rip(struct wmOperatorType *ot);
index 303de88aee4c5663a562269ef8b7c927a33ba0e5..023208ac1b38d3b1b29ed2495f3e455e222f09d3 100644 (file)
@@ -139,7 +139,7 @@ void ED_operatortypes_mesh(void)
        WM_operatortype_append(MESH_OT_fgon_clear);
        WM_operatortype_append(MESH_OT_fgon_make);
        WM_operatortype_append(MESH_OT_duplicate_add);
-       WM_operatortype_append(MESH_OT_remove_doubles);
+       WM_operatortype_append(MESH_OT_doubles_remove);
        WM_operatortype_append(MESH_OT_extrude);
        WM_operatortype_append(MESH_OT_spin);
        WM_operatortype_append(MESH_OT_screw);
@@ -151,15 +151,15 @@ void ED_operatortypes_mesh(void)
        WM_operatortype_append(MESH_OT_loop_to_region);
        WM_operatortype_append(MESH_OT_region_to_loop);
        
-       WM_operatortype_append(MESH_OT_rotate_uvs);
-       WM_operatortype_append(MESH_OT_mirror_uvs);
-       WM_operatortype_append(MESH_OT_rotate_colors);
-       WM_operatortype_append(MESH_OT_mirror_colors);
+       WM_operatortype_append(MESH_OT_uvs_rotate);
+       WM_operatortype_append(MESH_OT_uvs_mirror);
+       WM_operatortype_append(MESH_OT_colors_rotate);
+       WM_operatortype_append(MESH_OT_colors_mirror);
        
        WM_operatortype_append(MESH_OT_fill);
        WM_operatortype_append(MESH_OT_beauty_fill);
-       WM_operatortype_append(MESH_OT_convert_quads_to_tris);
-       WM_operatortype_append(MESH_OT_convert_tris_to_quads);
+       WM_operatortype_append(MESH_OT_quads_to_tris_convert);
+       WM_operatortype_append(MESH_OT_tris_to_quads_convert);
        WM_operatortype_append(MESH_OT_edge_flip);
        WM_operatortype_append(MESH_OT_faces_shade_smooth);
        WM_operatortype_append(MESH_OT_faces_shade_solid);
@@ -248,7 +248,7 @@ void ED_keymap_mesh(wmWindowManager *wm)
        /*WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
        WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi_fractal", WKEY, KM_PRESS, KM_ALT, 0);
        WM_keymap_add_item(keymap, "MESH_OT_subdivide_smooth", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);*/
-       WM_keymap_add_item(keymap, "MESH_OT_remove_doubles", VKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_doubles_remove", VKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "MESH_OT_extrude", EKEY, KM_PRESS, 0, 0);
        
        WM_keymap_add_item(keymap, "MESH_OT_spin", RKEY, KM_PRESS, KM_ALT, 0);
@@ -257,8 +257,8 @@ void ED_keymap_mesh(wmWindowManager *wm)
        WM_keymap_add_item(keymap, "VIEW3D_OT_editmesh_face_toolbox", FKEY, KM_PRESS, KM_CTRL, 0); /* operators below are in this toolbox */
        WM_keymap_add_item(keymap, "MESH_OT_fill", FKEY, KM_PRESS, KM_SHIFT, 0);
        WM_keymap_add_item(keymap, "MESH_OT_beauty_fill", FKEY, KM_PRESS, KM_ALT, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_convert_quads_to_tris", TKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_convert_tris_to_quads", JKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_quads_to_tris_convert", TKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_tris_to_quads_convert", JKEY, KM_PRESS, KM_ALT, 0);
        
        WM_keymap_add_item(keymap, "MESH_OT_split", FOURKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "MESH_OT_extrude_repeat", FOURKEY, KM_PRESS, KM_ALT, 0);
@@ -267,10 +267,10 @@ void ED_keymap_mesh(wmWindowManager *wm)
        WM_keymap_add_item(keymap, "MESH_OT_loop_to_region",SIXKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "MESH_OT_region_to_loop",SIXKEY, KM_PRESS, KM_ALT, 0);
        
-       WM_keymap_add_item(keymap, "MESH_OT_rotate_uvs",SEVENKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_mirror_uvs",SEVENKEY, KM_PRESS, KM_ALT, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_rotate_colors",EIGHTKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "MESH_OT_mirror_colors",EIGHTKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_uvs_rotate",SEVENKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_uvs_mirror",SEVENKEY, KM_PRESS, KM_ALT, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_colors_rotate",EIGHTKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "MESH_OT_colors_mirror",EIGHTKEY, KM_PRESS, KM_ALT, 0);
 
        WM_keymap_add_item(keymap, "MESH_OT_rip",VKEY, KM_PRESS, 0, 0);
 
index 1da034842c1b0f53ccc13c6354215977a513ae88..ce87b2994bbc183c6a3b827f4096128fa2227cb2 100644 (file)
@@ -5560,8 +5560,8 @@ static int editmesh_face_toolbox_invoke(bContext *C, wmOperator *op, wmEvent *ev
 
        uiMenuItemO(head, 0, "MESH_OT_fill");
        uiMenuItemO(head, 0, "MESH_OT_beauty_fill");
-       uiMenuItemO(head, 0, "MESH_OT_convert_quads_to_tris");
-       uiMenuItemO(head, 0, "MESH_OT_convert_tris_to_quads");
+       uiMenuItemO(head, 0, "MESH_OT_quads_to_tris_convert");
+       uiMenuItemO(head, 0, "MESH_OT_tris_to_quads_convert");
        uiMenuItemO(head, 0, "MESH_OT_edge_flip");
        uiMenuItemO(head, 0, "MESH_OT_faces_shade_smooth");
        uiMenuItemO(head, 0, "MESH_OT_faces_shade_solid");