From 8f658ec27c4fa51f9be8181eda063969fb14af84 Mon Sep 17 00:00:00 2001 From: Yevgeny Makarov Date: Wed, 22 Jul 2020 16:21:33 +1000 Subject: UI: use term 'Vertex' instead of 'Vert' --- source/blender/editors/mesh/editmesh_select.c | 5 +---- source/blender/editors/mesh/editmesh_tools.c | 16 ++++++++++------ source/blender/editors/object/object_vgroup.c | 8 ++++---- .../editors/transform/transform_mode_vert_slide.c | 2 +- source/blender/makesrna/intern/rna_mesh.c | 2 +- source/blender/makesrna/intern/rna_modifier.c | 4 ++-- source/blender/makesrna/intern/rna_object.c | 2 +- source/blender/makesrna/intern/rna_particle.c | 4 ++-- source/blender/makesrna/intern/rna_userdef.c | 4 ++-- source/blender/modifiers/intern/MOD_meshdeform.c | 5 +++-- source/blender/modifiers/intern/MOD_surfacedeform.c | 4 ++-- 11 files changed, 29 insertions(+), 27 deletions(-) diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 1198796cee1..1ea25353598 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -4229,10 +4229,7 @@ static int edbm_select_nth_exec(bContext *C, wmOperator *op) MEM_freeN(objects); if (!found_active_elt) { - BKE_report(op->reports, - RPT_ERROR, - (objects_len == 1 ? "Mesh has no active vert/edge/face" : - "Meshes have no active vert/edge/face")); + BKE_report(op->reports, RPT_ERROR, "Mesh object(s) have no active vertex/edge/face"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index c8cf1b4a163..5dc4ffcad18 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -5664,7 +5664,7 @@ static void edbm_dissolve_prop__use_verts(wmOperatorType *ot, bool value, int fl PropertyRNA *prop; prop = RNA_def_boolean( - ot->srna, "use_verts", value, "Dissolve Verts", "Dissolve remaining vertices"); + ot->srna, "use_verts", value, "Dissolve Vertices", "Dissolve remaining vertices"); if (flag) { RNA_def_property_flag(prop, flag); @@ -5729,7 +5729,7 @@ void MESH_OT_dissolve_verts(wmOperatorType *ot) { /* identifiers */ ot->name = "Dissolve Vertices"; - ot->description = "Dissolve verts, merge edges and faces"; + ot->description = "Dissolve vertices, merge edges and faces"; ot->idname = "MESH_OT_dissolve_verts"; /* api callbacks */ @@ -5996,7 +5996,7 @@ void MESH_OT_dissolve_limited(wmOperatorType *ot) ot->name = "Limited Dissolve"; ot->idname = "MESH_OT_dissolve_limited"; ot->description = - "Dissolve selected edges and verts, limited by the angle of surrounding geometry"; + "Dissolve selected edges and vertices, limited by the angle of surrounding geometry"; /* api callbacks */ ot->exec = edbm_dissolve_limited_exec; @@ -8697,17 +8697,21 @@ enum { }; static EnumPropertyItem average_method_items[] = { - {EDBM_CLNOR_AVERAGE_LOOP, "CUSTOM_NORMAL", 0, "Custom Normal", "Take Average of vert Normals"}, + {EDBM_CLNOR_AVERAGE_LOOP, + "CUSTOM_NORMAL", + 0, + "Custom Normal", + "Take average of vertex normals"}, {EDBM_CLNOR_AVERAGE_FACE_AREA, "FACE_AREA", 0, "Face Area", - "Set all vert normals by Face Area"}, + "Set all vertex normals by face area"}, {EDBM_CLNOR_AVERAGE_ANGLE, "CORNER_ANGLE", 0, "Corner Angle", - "Set all vert normals by Corner Angle"}, + "Set all vertex normals by corner angle"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index b8dbc5c279d..253287c382e 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -3005,7 +3005,7 @@ void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot) /* properties */ prop = RNA_def_boolean(ot->srna, "use_all_groups", 0, "All Groups", "Remove from all groups"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); - prop = RNA_def_boolean(ot->srna, "use_all_verts", 0, "All Verts", "Clear the active group"); + prop = RNA_def_boolean(ot->srna, "use_all_verts", 0, "All Vertices", "Clear the active group"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); } @@ -3494,12 +3494,12 @@ void OBJECT_OT_vertex_group_invert(wmOperatorType *ot) "auto_assign", true, "Add Weights", - "Add verts from groups that have zero weight before inverting"); + "Add vertices from groups that have zero weight before inverting"); RNA_def_boolean(ot->srna, "auto_remove", true, "Remove Weights", - "Remove verts from groups that have zero weight after inverting"); + "Remove vertices from groups that have zero weight after inverting"); } /** \} */ @@ -4352,7 +4352,7 @@ void OBJECT_OT_vertex_weight_paste(wmOperatorType *ot) ot->name = "Paste Weight to Selected"; ot->idname = "OBJECT_OT_vertex_weight_paste"; ot->description = - "Copy this group's weight to other selected verts (disabled if vertex group is locked)"; + "Copy this group's weight to other selected vertices (disabled if vertex group is locked)"; /* api callbacks */ ot->poll = vertex_group_vert_select_mesh_poll; diff --git a/source/blender/editors/transform/transform_mode_vert_slide.c b/source/blender/editors/transform/transform_mode_vert_slide.c index 4bcc4cc6383..b396317ba7c 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.c +++ b/source/blender/editors/transform/transform_mode_vert_slide.c @@ -601,7 +601,7 @@ static void applyVertSlide(TransInfo *t, const int UNUSED(mval[2])) t->values_final[0] = final; /* header string */ - ofs += BLI_strncpy_rlen(str + ofs, TIP_("Vert Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_("Vertex Slide: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 506bfdb8c75..bb5ec0d6835 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -3376,7 +3376,7 @@ static void rna_def_mesh(BlenderRNA *brna) /* readonly editmesh info - use for extrude menu */ prop = RNA_def_property(srna, "total_vert_sel", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_tot_vert_get", NULL, NULL); - RNA_def_property_ui_text(prop, "Selected Vert Total", "Selected vertex count in editmode"); + RNA_def_property_ui_text(prop, "Selected Vertex Total", "Selected vertex count in editmode"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "total_edge_sel", PROP_INT, PROP_UNSIGNED); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 3d32e4695f5..86f05c350f3 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -3257,12 +3257,12 @@ static void rna_def_modifier_correctivesmooth(BlenderRNA *brna) "ORCO", 0, "Original Coords", - "Use base mesh vert coords as the rest position"}, + "Use base mesh vertex coords as the rest position"}, {MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND, "BIND", 0, "Bind Coords", - "Use bind vert coords for rest position"}, + "Use bind vertex coords for rest position"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index b7346ac4f5b..84b83bee089 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -174,7 +174,7 @@ static const EnumPropertyItem parent_type_items[] = { #define INSTANCE_ITEMS_SHARED \ {0, "NONE", 0, "None", ""}, \ - {OB_DUPLIVERTS, "VERTS", 0, "Verts", "Instantiate child objects on all vertices"}, \ + {OB_DUPLIVERTS, "VERTS", 0, "Vertices", "Instantiate child objects on all vertices"}, \ { \ OB_DUPLIFACES, "FACES", 0, "Faces", "Instantiate child objects on all faces" \ } diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 14d84ddb9c8..af1f1847fc6 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -52,7 +52,7 @@ #ifdef RNA_RUNTIME static const EnumPropertyItem part_from_items[] = { - {PART_FROM_VERT, "VERT", 0, "Verts", ""}, + {PART_FROM_VERT, "VERT", 0, "Vertices", ""}, {PART_FROM_FACE, "FACE", 0, "Faces", ""}, {PART_FROM_VOLUME, "VOLUME", 0, "Volume", ""}, {0, NULL, 0, NULL, NULL}, @@ -61,7 +61,7 @@ static const EnumPropertyItem part_from_items[] = { #ifndef RNA_RUNTIME static const EnumPropertyItem part_reactor_from_items[] = { - {PART_FROM_VERT, "VERT", 0, "Verts", ""}, + {PART_FROM_VERT, "VERT", 0, "Vertices", ""}, {PART_FROM_FACE, "FACE", 0, "Faces", ""}, {PART_FROM_VOLUME, "VOLUME", 0, "Volume", ""}, {0, NULL, 0, NULL, NULL}, diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 4884b536258..00bbff5cf51 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2277,7 +2277,7 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "editmesh_active", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); - RNA_def_property_ui_text(prop, "Active Vert/Edge/Face", ""); + RNA_def_property_ui_text(prop, "Active Vertex/Edge/Face", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); prop = RNA_def_property(srna, "normal", PROP_FLOAT, PROP_COLOR_GAMMA); @@ -2976,7 +2976,7 @@ static void rna_def_userdef_theme_space_image(BlenderRNA *brna) prop = RNA_def_property(srna, "editmesh_active", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); - RNA_def_property_ui_text(prop, "Active Vert/Edge/Face", ""); + RNA_def_property_ui_text(prop, "Active Vertex/Edge/Face", ""); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); prop = RNA_def_property(srna, "wire_edit", PROP_FLOAT, PROP_COLOR_GAMMA); diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index e53de598218..ae031bffb04 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -409,11 +409,12 @@ static void meshdeformModifier_do(ModifierData *md, totcagevert = cagemesh->totvert; if (mmd->totvert != totvert) { - BKE_modifier_set_error(md, "Verts changed from %d to %d", mmd->totvert, totvert); + BKE_modifier_set_error(md, "Vertices changed from %d to %d", mmd->totvert, totvert); goto finally; } else if (mmd->totcagevert != totcagevert) { - BKE_modifier_set_error(md, "Cage verts changed from %d to %d", mmd->totcagevert, totcagevert); + BKE_modifier_set_error( + md, "Cage vertices changed from %d to %d", mmd->totcagevert, totcagevert); goto finally; } else if (mmd->bindcagecos == NULL) { diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index fc41afb6613..6a0e82a686b 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1130,7 +1130,7 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd_orig, freeData((ModifierData *)smd_orig); } else if (data.success == MOD_SDEF_BIND_RESULT_OVERLAP_ERR) { - BKE_modifier_set_error((ModifierData *)smd_eval, "Target contains overlapping verts"); + BKE_modifier_set_error((ModifierData *)smd_eval, "Target contains overlapping vertices"); freeData((ModifierData *)smd_orig); } else if (data.success == MOD_SDEF_BIND_RESULT_GENERIC_ERR) { @@ -1280,7 +1280,7 @@ static void surfacedeformModifier_do(ModifierData *md, /* Poly count checks */ if (smd->numverts != numverts) { - BKE_modifier_set_error(md, "Verts changed from %u to %u", smd->numverts, numverts); + BKE_modifier_set_error(md, "Vertices changed from %u to %u", smd->numverts, numverts); return; } else if (smd->numpoly != tnumpoly) { -- cgit v1.2.3