griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: fix and improve a few messages

Browse Source 
- Multiple issues in the Data Transfer modifier error messages:
  - "None" -> "none", this word in the middle of a sentence, no need
    for upper case.
  - "amount of <element>" -> "number", more appropriate for discrete
    counts.
  - "doesn't" -> "does not", to respect Blender's style guide.
- "The grease pencil object need an Armature modifier" -> "needs",
  grammar.
- "Armature modifier is not valid or wrong defined" -> "is invalid".
  Unclear what "wrong defined" means.
- The "Recent Reports" text block has not been used since 2.81.
- "Not valid subdivisions found to rebuild lower levels" -> "No
  valid...", typo.
- "extensions repository" -> "extension repository": typo.
- "... , but loose correct blending..." -> "lose": typo.
- "True when multiple enums ": trailing whitespace.
- "Number of ray per pixel" -> "rays": typo.
- "Curve Parameter node" -> "Spline ...": this is the actual name of
  the node after its rename in 1cd9fcd98d.

Pull Request: https://projects.blender.org/blender/blender/pulls/111145
This commit is contained in:
Damien Picard
2023-08-29 14:49:02 +02:00
committed by Hans Goudey
parent fc8c8da885
commit ea974b6681
10 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/blenkernel/intern/data_transfer.cc
View File

@@ -1447,22 +1447,22 @@ bool BKE_object_data_transfer_ex(Depsgraph *depsgraph,
if ((map_vert_mode == MREMAP_MODE_TOPOLOGY) && (num_verts_dst != num_verts_src)) {
BKE_report(reports,
RPT_ERROR,
"Source and destination meshes do not have the same amount of vertices, "
"Source and destination meshes do not have the same number of vertices, "
"'Topology' mapping cannot be used in this case");
continue;
}
if ((map_vert_mode & MREMAP_USE_EDGE) && (me_src->totedge == 0)) {
BKE_report(reports,
RPT_ERROR,
"Source mesh doesn't have any edges, "
"None of the 'Edge' mappings can be used in this case");
"Source mesh does not have any edges, "
"none of the 'Edge' mappings can be used in this case");
continue;
}
if ((map_vert_mode & MREMAP_USE_POLY) && (me_src->faces_num == 0)) {
BKE_report(reports,
RPT_ERROR,
"Source mesh doesn't have any faces, "
"None of the 'Face' mappings can be used in this case");
"Source mesh does not have any faces, "
"none of the 'Face' mappings can be used in this case");
continue;
}
if (ELEM(0, num_verts_dst, num_verts_src)) {
@@ -1532,15 +1532,15 @@ bool BKE_object_data_transfer_ex(Depsgraph *depsgraph,
if ((map_edge_mode == MREMAP_MODE_TOPOLOGY) && (edges_dst.size() != num_edges_src)) {
BKE_report(reports,
RPT_ERROR,
"Source and destination meshes do not have the same amount of edges, "
"Source and destination meshes do not have the same number of edges, "
"'Topology' mapping cannot be used in this case");
continue;
}
if ((map_edge_mode & MREMAP_USE_POLY) && (me_src->faces_num == 0)) {
BKE_report(reports,
RPT_ERROR,
"Source mesh doesn't have any faces, "
"None of the 'Face' mappings can be used in this case");
"Source mesh does not have any faces, "
"none of the 'Face' mappings can be used in this case");
continue;
}
if (ELEM(0, edges_dst.size(), num_edges_src)) {
@@ -1623,15 +1623,15 @@ bool BKE_object_data_transfer_ex(Depsgraph *depsgraph,
{
BKE_report(reports,
RPT_ERROR,
"Source and destination meshes do not have the same amount of face corners, "
"Source and destination meshes do not have the same number of face corners, "
"'Topology' mapping cannot be used in this case");
continue;
}
if ((map_loop_mode & MREMAP_USE_EDGE) && (me_src->totedge == 0)) {
BKE_report(reports,
RPT_ERROR,
"Source mesh doesn't have any edges, "
"None of the 'Edge' mappings can be used in this case");
"Source mesh does not have any edges, "
"none of the 'Edge' mappings can be used in this case");
continue;
}
if (ELEM(0, corner_verts_dst.size(), num_loops_src)) {
@@ -1717,15 +1717,15 @@ bool BKE_object_data_transfer_ex(Depsgraph *depsgraph,
if ((map_face_mode == MREMAP_MODE_TOPOLOGY) && (faces_dst.size() != num_faces_src)) {
BKE_report(reports,
RPT_ERROR,
"Source and destination meshes do not have the same amount of faces, "
"Source and destination meshes do not have the same number of faces, "
"'Topology' mapping cannot be used in this case");
continue;
}
if ((map_face_mode & MREMAP_USE_EDGE) && (me_src->totedge == 0)) {
BKE_report(reports,
RPT_ERROR,
"Source mesh doesn't have any edges, "
"None of the 'Edge' mappings can be used in this case");
"Source mesh does not have any edges, "
"none of the 'Edge' mappings can be used in this case");
continue;
}
if (ELEM(0, faces_dst.size(), num_faces_src)) {

4
source/blender/editors/gpencil_legacy/gpencil_armature.cc
View File

@@ -591,13 +591,13 @@ static int gpencil_generate_weights_exec(bContext *C, wmOperator *op)
GpencilModifierData *md = BKE_gpencil_modifiers_findby_type(ob_eval,
eGpencilModifierType_Armature);
if (md == nullptr) {
BKE_report(op->reports, RPT_ERROR, "The grease pencil object need an Armature modifier");
BKE_report(op->reports, RPT_ERROR, "The grease pencil object needs an Armature modifier");
return OPERATOR_CANCELLED;
}
ArmatureGpencilModifierData *mmd = (ArmatureGpencilModifierData *)md;
if (mmd->object == nullptr) {
BKE_report(op->reports, RPT_ERROR, "Armature modifier is not valid or wrong defined");
BKE_report(op->reports, RPT_ERROR, "The Armature modifier is invalid");
return OPERATOR_CANCELLED;
}

2
source/blender/editors/interface/interface_templates.cc
View File

@@ -6471,7 +6471,7 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C)
0,
UI_UNIT_X,
UI_UNIT_Y,
TIP_("Click to see the remaining reports in text block: 'Recent Reports'"));
TIP_("Click to open the info editor"));
UI_GetThemeColorType4ubv(UI_text_colorid_from_report_type(report->type), SPACE_INFO, but->col);
but->col[3] = 255; /* This theme color is RBG only, so have to set alpha here. */

2
source/blender/editors/object/object_modifier.cc
View File

@@ -2643,7 +2643,7 @@ static int multires_rebuild_subdiv_exec(bContext *C, wmOperator *op)
int new_levels = multiresModifier_rebuild_subdiv(depsgraph, object, mmd, INT_MAX, false);
if (new_levels == 0) {
BKE_report(op->reports, RPT_ERROR, "Not valid subdivisions found to rebuild lower levels");
BKE_report(op->reports, RPT_ERROR, "No valid subdivisions found to rebuild lower levels");
return OPERATOR_CANCELLED;
}

4
source/blender/editors/space_userpref/userpref_ops.cc
View File

@@ -282,7 +282,7 @@ static void PREFERENCES_OT_extension_repo_add(wmOperatorType *ot)
{
ot->name = "Add Extension Repository";
ot->idname = "PREFERENCES_OT_extension_repo_add";
ot->description = "Add a directory to be used as a local extensions repository";
ot->description = "Add a directory to be used as a local extension repository";
ot->exec = preferences_extension_repo_add_exec;
ot->invoke = preferences_extension_repo_add_invoke;
@@ -343,7 +343,7 @@ static void PREFERENCES_OT_extension_repo_remove(wmOperatorType *ot)
{
ot->name = "Remove Extension Repository";
ot->idname = "PREFERENCES_OT_extension_repo_remove";
ot->description = "Remove an extensions repository";
ot->description = "Remove an extension repository";
ot->exec = preferences_extension_repo_remove_exec;
ot->poll = preferences_extension_repo_remove_poll;

2
source/blender/makesrna/intern/rna_lightprobe.cc
View File

@@ -247,7 +247,7 @@ static void rna_def_lightprobe(BlenderRNA *brna)
prop,
"Capture World",
"Bake incoming light from the world, instead of just the visibility, "
"for more accurate lighting, but loose correct blending to surrounding irradiance volumes");
"for more accurate lighting, but lose correct blending to surrounding irradiance volumes");
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, nullptr);
prop = RNA_def_property(srna, "grid_capture_indirect", PROP_BOOLEAN, PROP_NONE);

2
source/blender/makesrna/intern/rna_rna.cc
View File

@@ -3161,7 +3161,7 @@ static void rna_def_property(BlenderRNA *brna)
prop = RNA_def_property(srna, "is_enum_flag", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_boolean_funcs(prop, "rna_Property_is_enum_flag_get", nullptr);
RNA_def_property_ui_text(prop, "Enum Flag", "True when multiple enums ");
RNA_def_property_ui_text(prop, "Enum Flag", "True when multiple enums");
prop = RNA_def_property(srna, "is_library_editable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);

2
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -7399,7 +7399,7 @@ static void rna_def_raytrace_eevee(BlenderRNA *brna)
prop = RNA_def_property(srna, "resolution_scale", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, pixel_rate_items);
RNA_def_property_ui_text(prop, "Resolution", "Number of ray per pixel");
RNA_def_property_ui_text(prop, "Resolution", "Number of rays per pixel");
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, nullptr);

2
source/blender/makesrna/intern/rna_userdef.cc
View File

@@ -6519,7 +6519,7 @@ static void rna_def_userdef_filepaths_extension_repo(BlenderRNA *brna)
prop = RNA_def_property(srna, "remote_path", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, nullptr, "remote_path");
RNA_def_property_ui_text(prop, "Remote Path", "Remote URL or path for extensions repository");
RNA_def_property_ui_text(prop, "Remote Path", "Remote URL or path for extension repository");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_EDITOR_FILEBROWSER);
RNA_def_property_update(prop, 0, "rna_userdef_update");

3
source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc
View File

@@ -171,7 +171,8 @@ static Array<float> calculate_point_parameters(const bke::CurvesGeometry &curves
class CurveParameterFieldInput final : public bke::CurvesFieldInput {
public:
CurveParameterFieldInput() : bke::CurvesFieldInput(CPPType::get<float>(), "Curve Parameter node")
CurveParameterFieldInput()
: bke::CurvesFieldInput(CPPType::get<float>(), "Spline Parameter node")
{
category_ = Category::Generated;
}