diff options
author | Shaul Kedem <shaul_kedem@yahoo.com> | 2009-04-12 21:43:43 +0400 |
---|---|---|
committer | Shaul Kedem <shaul_kedem@yahoo.com> | 2009-04-12 21:43:43 +0400 |
commit | 0780269f13e2db3982256a568db455fd0b30a583 (patch) | |
tree | 8674201a813adaba2c6c0092b7a77c9b4e613488 /source/blender | |
parent | 095fe990e8c818179a1c343892b0e81825ca7f09 (diff) |
editmesh_mods.c op names change
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 44 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 22 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 50 |
3 files changed, 58 insertions, 58 deletions
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index fe32e7b2568..b0eacc83953 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -817,11 +817,11 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_select_face_similar(wmOperatorType *ot) +void MESH_OT_faces_select_similar(wmOperatorType *ot) { /* identifiers */ ot->name= "Similar Face Select"; - ot->idname= "MESH_OT_select_face_similar"; + ot->idname= "MESH_OT_faces_select_similar"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1078,11 +1078,11 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_select_edge_similar(wmOperatorType *ot) +void MESH_OT_edges_select_similar(wmOperatorType *ot) { /* identifiers */ ot->name= "Similar Edge Select"; - ot->idname= "MESH_OT_select_edge_similar"; + ot->idname= "MESH_OT_edges_select_similar"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1248,11 +1248,11 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } -void MESH_OT_select_vertex_similar(wmOperatorType *ot) +void MESH_OT_vertices_select_similar(wmOperatorType *ot) { /* identifiers */ ot->name= "Similar Vertex Select"; - ot->idname= "MESH_OT_select_vertex_similar"; + ot->idname= "MESH_OT_vertices_select_similar"; /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1975,11 +1975,11 @@ static int loop_multiselect(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_select_loop_multi(wmOperatorType *ot) +void MESH_OT_loop_multi_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Multi Select Loops"; - ot->idname= "MESH_OT_select_loop_multi"; + ot->idname= "MESH_OT_loop_multi_select"; /* api callbacks */ ot->exec= loop_multiselect; @@ -2053,11 +2053,11 @@ static int mesh_select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_FINISHED; } -void MESH_OT_select_loop(wmOperatorType *ot) +void MESH_OT_loop_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Loop Select"; - ot->idname= "MESH_OT_select_loop"; + ot->idname= "MESH_OT_loop_select"; /* api callbacks */ ot->invoke= mesh_select_loop_invoke; @@ -2152,11 +2152,11 @@ static int mesh_shortest_path_select_invoke(bContext *C, wmOperator *op, wmEvent return OPERATOR_FINISHED; } -void MESH_OT_select_path_shortest(wmOperatorType *ot) +void MESH_OT_path_select_shortest(wmOperatorType *ot) { /* identifiers */ ot->name= "Shortest Path Select"; - ot->idname= "MESH_OT_select_path_shortest"; + ot->idname= "MESH_OT_path_select_shortest"; /* api callbacks */ ot->invoke= mesh_shortest_path_select_invoke; @@ -2872,11 +2872,11 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_select_sharp_edges(wmOperatorType *ot) +void MESH_OT_edges_select_sharp(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Sharp Edges"; - ot->idname= "MESH_OT_select_sharp_edges"; + ot->idname= "MESH_OT_edges_select_sharp"; /* api callbacks */ ot->exec= select_sharp_edges_exec; @@ -3039,11 +3039,11 @@ static int select_linked_flat_faces_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_select_linked_flat_faces(wmOperatorType *ot) +void MESH_OT_faces_select_linked_flat(wmOperatorType *ot) { /* identifiers */ ot->name= "Select Linked Flat Faces"; - ot->idname= "MESH_OT_select_linked_flat_faces"; + ot->idname= "MESH_OT_faces_select_linked_flat"; /* api callbacks */ ot->exec= select_linked_flat_faces_exec; @@ -4069,11 +4069,11 @@ static int righthandfaces_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_consistant_normals(wmOperatorType *ot) +void MESH_OT_normals_make_consistant(wmOperatorType *ot) { /* identifiers */ ot->name= "Make Normals Consistant"; - ot->idname= "MESH_OT_consistant_normals"; + ot->idname= "MESH_OT_normals_make_consistant"; /* api callbacks */ ot->exec= righthandfaces_exec; @@ -4406,11 +4406,11 @@ static int smooth_vertex(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_smooth_vertex(wmOperatorType *ot) +void MESH_OT_vertices_smooth(wmOperatorType *ot) { /* identifiers */ ot->name= "Smooth Vertex"; - ot->idname= "MESH_OT_smooth_vertex"; + ot->idname= "MESH_OT_vertices_smooth"; /* api callbacks */ ot->exec= smooth_vertex; @@ -4537,11 +4537,11 @@ static int vertices_to_sphere_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_vertices_to_sphere(wmOperatorType *ot) +void MESH_OT_vertices_to_sphere_transform(wmOperatorType *ot) { /* identifiers */ ot->name= "Vertices to Sphere"; - ot->idname= "MESH_OT_vertices_to_sphere"; + ot->idname= "MESH_OT_vertices_to_sphere_transform"; /* api callbacks */ ot->exec= vertices_to_sphere_exec; diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 87ec6478009..02159b9a40b 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -144,7 +144,7 @@ extern struct EditFace *EM_face_from_faces(EditMesh *em, struct EditFace *efa1, void MESH_OT_knife_cut(struct wmOperatorType *ot); /* ******************* editmesh_mods.c */ -void MESH_OT_select_loop(struct wmOperatorType *ot); +void MESH_OT_loop_select(struct wmOperatorType *ot); void MESH_OT_select_all_toggle(struct wmOperatorType *ot); void MESH_OT_select_more(struct wmOperatorType *ot); void MESH_OT_select_less(struct wmOperatorType *ot); @@ -154,20 +154,20 @@ void MESH_OT_select_linked(struct wmOperatorType *ot); void MESH_OT_select_linked_pick(struct wmOperatorType *ot); void MESH_OT_hide(struct wmOperatorType *ot); void MESH_OT_reveal(struct wmOperatorType *ot); -void MESH_OT_consistant_normals(struct wmOperatorType *ot); -void MESH_OT_select_linked_flat_faces(struct wmOperatorType *ot); -void MESH_OT_select_sharp_edges(struct wmOperatorType *ot); -void MESH_OT_select_path_shortest(struct wmOperatorType *ot); -void MESH_OT_select_vertex_similar(struct wmOperatorType *ot); -void MESH_OT_select_edge_similar(struct wmOperatorType *ot); -void MESH_OT_select_face_similar(struct wmOperatorType *ot); +void MESH_OT_normals_make_consistant(struct wmOperatorType *ot); +void MESH_OT_faces_select_linked_flat(struct wmOperatorType *ot); +void MESH_OT_edges_select_sharp(struct wmOperatorType *ot); +void MESH_OT_path_select_shortest(struct wmOperatorType *ot); +void MESH_OT_vertices_select_similar(struct wmOperatorType *ot); +void MESH_OT_edges_select_similar(struct wmOperatorType *ot); +void MESH_OT_faces_select_similar(struct wmOperatorType *ot); void MESH_OT_select_random(struct wmOperatorType *ot); -void MESH_OT_vertices_to_sphere(struct wmOperatorType *ot); +void MESH_OT_vertices_to_sphere_transform(struct wmOperatorType *ot); void MESH_OT_selection_type(struct wmOperatorType *ot); -void MESH_OT_select_loop_multi(struct wmOperatorType *ot); +void MESH_OT_loop_multi_select(struct wmOperatorType *ot); void MESH_OT_mark_seam(struct wmOperatorType *ot); void MESH_OT_mark_sharp(struct wmOperatorType *ot); -void MESH_OT_smooth_vertex(struct wmOperatorType *ot); +void MESH_OT_vertices_smooth(struct wmOperatorType *ot); void MESH_OT_flip_editnormals(struct wmOperatorType *ot); extern EditEdge *findnearestedge(ViewContext *vc, int *dist); diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 45a7f4a32fe..303de88aee4 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -118,14 +118,14 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_selection_type); WM_operatortype_append(MESH_OT_hide); WM_operatortype_append(MESH_OT_reveal); - WM_operatortype_append(MESH_OT_consistant_normals); + WM_operatortype_append(MESH_OT_normals_make_consistant); WM_operatortype_append(MESH_OT_subdivide); WM_operatortype_append(MESH_OT_subdivide_multi); WM_operatortype_append(MESH_OT_subdivide_multi_fractal); WM_operatortype_append(MESH_OT_subdivide_smooth); 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_faces_select_linked_flat); + WM_operatortype_append(MESH_OT_edges_select_sharp); WM_operatortype_append(MESH_OT_primitive_plane_add); WM_operatortype_append(MESH_OT_primitive_cube_add); WM_operatortype_append(MESH_OT_primitive_circle_add); @@ -144,7 +144,7 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_spin); WM_operatortype_append(MESH_OT_screw); - WM_operatortype_append(MESH_OT_vertices_to_sphere); + WM_operatortype_append(MESH_OT_vertices_to_sphere_transform); WM_operatortype_append(MESH_OT_split); WM_operatortype_append(MESH_OT_extrude_repeat); WM_operatortype_append(MESH_OT_edge_rotate); @@ -168,16 +168,16 @@ 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_loop_select); 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); - WM_operatortype_append(MESH_OT_select_face_similar); - WM_operatortype_append(MESH_OT_select_loop_multi); + WM_operatortype_append(MESH_OT_path_select_shortest); + WM_operatortype_append(MESH_OT_vertices_select_similar); + WM_operatortype_append(MESH_OT_edges_select_similar); + WM_operatortype_append(MESH_OT_faces_select_similar); + WM_operatortype_append(MESH_OT_loop_multi_select); WM_operatortype_append(MESH_OT_mark_seam); WM_operatortype_append(MESH_OT_mark_sharp); - WM_operatortype_append(MESH_OT_smooth_vertex); + WM_operatortype_append(MESH_OT_vertices_smooth); WM_operatortype_append(MESH_OT_flip_editnormals); WM_operatortype_append(MESH_OT_knife_cut); WM_operatortype_append(MESH_OT_rip); @@ -192,16 +192,16 @@ void ED_keymap_mesh(wmWindowManager *wm) /* selecting */ /* standard mouse selection goes via space_view3d */ - WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_ALT, 0); - kmi= WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0); + WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0); + kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0); RNA_boolean_set(kmi->ptr, "extend", 1); - kmi= WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0); + kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_ALT|KM_CTRL, 0); RNA_boolean_set(kmi->ptr, "ring", 1); - kmi= WM_keymap_add_item(keymap, "MESH_OT_select_loop", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0); + kmi= WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT|KM_CTRL, 0); RNA_boolean_set(kmi->ptr, "extend", 1); RNA_boolean_set(kmi->ptr, "ring", 1); - WM_keymap_add_item(keymap, "MESH_OT_select_path_shortest", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "MESH_OT_path_select_shortest", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "MESH_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MESH_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0); @@ -213,11 +213,11 @@ void ED_keymap_mesh(wmWindowManager *wm) WM_keymap_add_item(keymap, "MESH_OT_select_linked_pick", LKEY, KM_PRESS, 0, 0); RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_select_linked_pick", LKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "deselect", 1); - RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_linked_flat_faces", FKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0); - RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_sharp_edges", SKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0); + RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_faces_select_linked_flat", FKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0); + RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_edges_select_sharp", SKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0); WM_keymap_add_item(keymap, "MESH_OT_select_random", SPACEKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "MESH_OT_vertices_to_sphere", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT , 0); + WM_keymap_add_item(keymap, "MESH_OT_vertices_to_sphere_transform", SKEY, KM_PRESS, KM_CTRL|KM_SHIFT , 0); WM_keymap_add_item(keymap, "MESH_OT_mark_seam", ONEKEY, KM_PRESS, KM_CTRL , 0); RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_mark_seam", ONEKEY, KM_PRESS, KM_ALT , 0)->ptr,"clear",1); @@ -226,9 +226,9 @@ void ED_keymap_mesh(wmWindowManager *wm) RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_mark_sharp", TWOKEY, KM_PRESS, KM_ALT , 0)->ptr,"set",1); /* temp hotkeys! */ - WM_keymap_add_item(keymap, "MESH_OT_select_vertex_similar", GKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "MESH_OT_select_edge_similar", GKEY, KM_PRESS, KM_SHIFT2|KM_CTRL, 0); - WM_keymap_add_item(keymap, "MESH_OT_select_face_similar", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL2, 0); + WM_keymap_add_item(keymap, "MESH_OT_vertices_select_similar", GKEY, KM_PRESS, KM_SHIFT, 0); + WM_keymap_add_item(keymap, "MESH_OT_edges_select_similar", GKEY, KM_PRESS, KM_SHIFT2|KM_CTRL, 0); + WM_keymap_add_item(keymap, "MESH_OT_faces_select_similar", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL2, 0); /* selection mode */ WM_keymap_add_item(keymap, "MESH_OT_selection_type", TABKEY, KM_PRESS, KM_CTRL, 0); @@ -239,9 +239,9 @@ void ED_keymap_mesh(wmWindowManager *wm) WM_keymap_add_item(keymap, "MESH_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0); /* tools */ - WM_keymap_add_item(keymap, "MESH_OT_consistant_normals", NKEY, KM_PRESS, KM_CTRL, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_consistant_normals", NKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "inside", 1); - WM_keymap_add_item(keymap, "MESH_OT_smooth_vertex", THREEKEY, KM_PRESS, KM_CTRL , 0); + WM_keymap_add_item(keymap, "MESH_OT_normals_make_consistant", NKEY, KM_PRESS, KM_CTRL, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "MESH_OT_normals_make_consistant", NKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "inside", 1); + WM_keymap_add_item(keymap, "MESH_OT_vertices_smooth", THREEKEY, KM_PRESS, KM_CTRL , 0); WM_keymap_add_item(keymap, "MESH_OT_flip_editnormals", THREEKEY, KM_PRESS, KM_ALT , 0); WM_keymap_add_item(keymap, "MESH_OT_subdivs", WKEY, KM_PRESS, 0, 0); // this is the menu |