diff options
author | Shaul Kedem <shaul_kedem@yahoo.com> | 2009-04-12 21:54:07 +0400 |
---|---|---|
committer | Shaul Kedem <shaul_kedem@yahoo.com> | 2009-04-12 21:54:07 +0400 |
commit | 17814e8bf1c9760fa04d9cafdfbe6d908e55eb54 (patch) | |
tree | ec31867c98731ce10674b97d103ef01bdfa8e5e4 | |
parent | 0780269f13e2db3982256a568db455fd0b30a583 (diff) |
editmesh_tools.c op name change
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 28 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 14 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 28 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 4 |
4 files changed, 37 insertions, 37 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index e6d156a41b8..5ce86a7eb87 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -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; diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 02159b9a40b..0ea410a6279 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -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); diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 303de88aee4..023208ac1b3 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -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); diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 1da034842c1..ce87b2994bb 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -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"); |