Revision: 19738
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19738
Author: blendix
Date: 2009-04-15 17:40:31 +0200 (Wed, 15 Apr 2009)
Log Message:
-----------
2.5: Operator naming, reviewed some of the recent changes
by Shaul, did some minor tweaks.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_lib.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h
branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
2009-04-15 15:12:42 UTC (rev 19737)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
2009-04-15 15:40:31 UTC (rev 19738)
@@ -1465,7 +1465,7 @@
if(em->selected.first)
BLI_freelistN(&(em->selected)); /* clear the selection order */
- EM_selectmode_set(em); // enforce full consistant selection flags
+ EM_selectmode_set(em); // enforce full consistent selection flags
EM_stats_update(em);
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_lib.c
2009-04-15 15:12:42 UTC (rev 19737)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_lib.c
2009-04-15 15:40:31 UTC (rev 19738)
@@ -549,7 +549,7 @@
EM_nfaces_selected(em);
}
-/* when vertices or edges can be selected, also make fgon consistant */
+/* when vertices or edges can be selected, also make fgon consistent */
static void check_fgons_selection(EditMesh *em)
{
EditFace *efa, *efan;
@@ -740,7 +740,7 @@
EM_nfaces_selected(em);
}
-/* when switching select mode, makes sure selection is consistant for editing
*/
+/* when switching select mode, makes sure selection is consistent for editing
*/
/* also for paranoia checks to make sure edge or face mode works */
void EM_selectmode_set(EditMesh *em)
{
@@ -1751,7 +1751,7 @@
EditFace *efa, *newfa, *act_efa = EM_get_actFace(em, 0);
EM_clear_flag_all(em, 128);
- EM_selectmode_set(em); // paranoia check, selection now is consistant
+ EM_selectmode_set(em); // paranoia check, selection now is consistent
/* vertices first */
for(eve= em->verts.last; eve; eve= eve->prev) {
Modified:
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
2009-04-15 15:12:42 UTC (rev 19737)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
2009-04-15 15:40:31 UTC (rev 19738)
@@ -2152,11 +2152,11 @@
return OPERATOR_FINISHED;
}
-void MESH_OT_path_select_shortest(wmOperatorType *ot)
+void MESH_OT_select_shortest_path(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Shortest Path Select";
- ot->idname= "MESH_OT_path_select_shortest";
+ ot->idname= "MESH_OT_select_shortest_path";
/* api callbacks */
ot->invoke= mesh_shortest_path_select_invoke;
@@ -4069,11 +4069,11 @@
return OPERATOR_FINISHED;
}
-void MESH_OT_normals_make_consistant(wmOperatorType *ot)
+void MESH_OT_normals_make_consistent(wmOperatorType *ot)
{
/* identifiers */
- ot->name= "Make Normals Consistant";
- ot->idname= "MESH_OT_normals_make_consistant";
+ ot->name= "Make Normals Consistent";
+ ot->idname= "MESH_OT_normals_make_consistent";
/* api callbacks */
ot->exec= righthandfaces_exec;
@@ -4537,11 +4537,11 @@
return OPERATOR_FINISHED;
}
-void MESH_OT_vertices_to_sphere_transform(wmOperatorType *ot)
+void MESH_OT_vertices_transform_to_sphere(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Vertices to Sphere";
- ot->idname= "MESH_OT_vertices_to_sphere_transform";
+ ot->idname= "MESH_OT_vertices_transform_to_sphere";
/* api callbacks */
ot->exec= vertices_to_sphere_exec;
Modified:
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
2009-04-15 15:12:42 UTC (rev 19737)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
2009-04-15 15:40:31 UTC (rev 19738)
@@ -504,11 +504,11 @@
return OPERATOR_FINISHED;
}
-void MESH_OT_doubles_remove(wmOperatorType *ot)
+void MESH_OT_remove_doubles(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Remove Doubles";
- ot->idname= "MESH_OT_doubles_remove";
+ ot->idname= "MESH_OT_remove_doubles";
/* api callbacks */
ot->exec= removedoublesflag_exec;
@@ -6954,7 +6954,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
-static int convert_quads_to_tris_exec(bContext *C, wmOperator *op)
+static int quads_convert_to_tris_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
@@ -6967,21 +6967,21 @@
return OPERATOR_FINISHED;
}
-void MESH_OT_quads_to_tris_convert(wmOperatorType *ot)
+void MESH_OT_quads_convert_to_tris(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Quads to Tris";
- ot->idname= "MESH_OT_quads_to_tris_convert";
+ ot->idname= "MESH_OT_quads_convert_to_tris";
/* api callbacks */
- ot->exec= convert_quads_to_tris_exec;
+ ot->exec= quads_convert_to_tris_exec;
ot->poll= ED_operator_editmesh;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
-static int convert_tris_to_quads_exec(bContext *C, wmOperator *op)
+static int tris_convert_to_quads_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
@@ -6994,14 +6994,14 @@
return OPERATOR_FINISHED;
}
-void MESH_OT_tris_to_quads_convert(wmOperatorType *ot)
+void MESH_OT_tris_convert_to_quads(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Tris to Quads";
- ot->idname= "MESH_OT_tris_to_quads_convert";
+ ot->idname= "MESH_OT_tris_convert_to_quads";
/* api callbacks */
- ot->exec= convert_tris_to_quads_exec;
+ ot->exec= tris_convert_to_quads_exec;
ot->poll= ED_operator_editmesh;
/* flags */
Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
2009-04-15 15:12:42 UTC (rev 19737)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
2009-04-15 15:40:31 UTC (rev 19738)
@@ -154,15 +154,15 @@
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_normals_make_consistant(struct wmOperatorType *ot);
+void MESH_OT_normals_make_consistent(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_select_shortest_path(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_transform(struct wmOperatorType *ot);
+void MESH_OT_vertices_transform_to_sphere(struct wmOperatorType *ot);
void MESH_OT_selection_type(struct wmOperatorType *ot);
void MESH_OT_loop_multi_select(struct wmOperatorType *ot);
void MESH_OT_mark_seam(struct wmOperatorType *ot);
@@ -207,15 +207,15 @@
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_doubles_remove(struct wmOperatorType *ot);
+void MESH_OT_remove_doubles(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_quads_to_tris_convert(struct wmOperatorType *ot);
-void MESH_OT_tris_to_quads_convert(struct wmOperatorType *ot);
+void MESH_OT_quads_convert_to_tris(struct wmOperatorType *ot);
+void MESH_OT_tris_convert_to_quads(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);
Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
2009-04-15 15:12:42 UTC (rev 19737)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
2009-04-15 15:40:31 UTC (rev 19738)
@@ -118,7 +118,7 @@
WM_operatortype_append(MESH_OT_selection_type);
WM_operatortype_append(MESH_OT_hide);
WM_operatortype_append(MESH_OT_reveal);
- WM_operatortype_append(MESH_OT_normals_make_consistant);
+ WM_operatortype_append(MESH_OT_normals_make_consistent);
WM_operatortype_append(MESH_OT_subdivide);
WM_operatortype_append(MESH_OT_subdivide_multi);
WM_operatortype_append(MESH_OT_subdivide_multi_fractal);
@@ -139,12 +139,12 @@
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_doubles_remove);
+ WM_operatortype_append(MESH_OT_remove_doubles);
WM_operatortype_append(MESH_OT_extrude);
WM_operatortype_append(MESH_OT_spin);
WM_operatortype_append(MESH_OT_screw);
- WM_operatortype_append(MESH_OT_vertices_to_sphere_transform);
+ WM_operatortype_append(MESH_OT_vertices_transform_to_sphere);
WM_operatortype_append(MESH_OT_split);
WM_operatortype_append(MESH_OT_extrude_repeat);
WM_operatortype_append(MESH_OT_edge_rotate);
@@ -158,8 +158,8 @@
WM_operatortype_append(MESH_OT_fill);
WM_operatortype_append(MESH_OT_beauty_fill);
- WM_operatortype_append(MESH_OT_quads_to_tris_convert);
- WM_operatortype_append(MESH_OT_tris_to_quads_convert);
+ WM_operatortype_append(MESH_OT_quads_convert_to_tris);
+ WM_operatortype_append(MESH_OT_tris_convert_to_quads);
WM_operatortype_append(MESH_OT_edge_flip);
WM_operatortype_append(MESH_OT_faces_shade_smooth);
WM_operatortype_append(MESH_OT_faces_shade_solid);
@@ -170,7 +170,7 @@
WM_operatortype_append(MESH_OT_dupli_extrude_cursor);
WM_operatortype_append(MESH_OT_loop_select);
WM_operatortype_append(MESH_OT_edge_face_add);
- WM_operatortype_append(MESH_OT_path_select_shortest);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
