UI: fix and improve a few messages #111145

Merged
Hans Goudey merged 2 commits from pioverfour/blender:dp_fix_messages into main 2023-08-29 14:49:10 +02:00
10 changed files with 26 additions and 25 deletions

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, "
Review
  • "amount of " -> "number", more appropriate for discrete counts.
- "amount of <element>" -> "number", more appropriate for discrete counts.
"'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");
Review
  • "doesn't" -> "does not", to respect Blender's style guide
  • "None" -> "none", this word in the middle of a sentence, no need for upper case
- "doesn't" -> "does not", to respect Blender's style guide - "None" -> "none", this word in the middle of a sentence, no need for upper 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)) {

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");
Review

Typo

Typo
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");
Review

Rephrase, unclear what "wrong defined" means

Rephrase, unclear what "wrong defined" means
return OPERATOR_CANCELLED;
}

View File

@ -6469,7 +6469,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"));

The "Recent Reports" text block has not been used since 2.81.

The "Recent Reports" text block has not been used since 2.81.

"Info" doesn't need to be capitalized.

"Info" doesn't need to be capitalized.
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. */

View File

@ -2655,7 +2655,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");
Review

Typo

Typo
return OPERATOR_CANCELLED;
}

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";
Review

Typo

Typo
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";
Review

Typo

Typo
ot->exec = preferences_extension_repo_remove_exec;
ot->poll = preferences_extension_repo_remove_poll;

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");
Review

Typo

Typo
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, nullptr);
prop = RNA_def_property(srna, "grid_capture_indirect", PROP_BOOLEAN, PROP_NONE);

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");
Review

Trailing whitespace

Trailing whitespace
prop = RNA_def_property(srna, "is_library_editable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);

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");
Review

Typo

Typo
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, nullptr);

View File

@ -6489,7 +6489,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");
Review

Typo

Typo
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_EDITOR_FILEBROWSER);
RNA_def_property_update(prop, 0, "rna_userdef_update");

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")
Review

"Curve Parameter node" -> "Spline ...": this is the actual name of the node after its rename in 1cd9fcd98d.

"Curve Parameter node" -> "Spline ...": this is the actual name of the node after its rename in 1cd9fcd98d.
{
category_ = Category::Generated;
}