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

Cleanup: UI messages fixes and tweaks.

Browse Source
This commit is contained in:
Bastien Montagne
2023-04-17 11:40:14 +02:00
parent 5491563e59
commit dfa42c614f
14 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/addon/__init__.py
View File

@@ -106,7 +106,7 @@ class CyclesRender(bpy.types.RenderEngine):
from . import osl
osl.update_script_node(node, self.report)
else:
self.report({'ERROR'}, "OSL support disabled in this build.")
self.report({'ERROR'}, "OSL support disabled in this build")
def update_render_passes(self, scene, srl):
engine.register_passes(self, scene, srl)

2
intern/cycles/bvh/build.cpp
View File

@@ -527,7 +527,7 @@ BVHNode *BVHBuild::run()
if (progress.get_cancel()) {
rootnode->deleteSubtree();
rootnode = NULL;
VLOG_WORK << "BVH build cancelled.";
VLOG_WORK << "BVH build canceled.";
}
else {
/*rotate(rootnode, 4, 5);*/

5
scripts/modules/bl_i18n_utils/settings.py
View File

@@ -392,6 +392,9 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"image file not found",
"image format is read-only",
"image path can't be written to",
"in %i days",
"in %i hours",
"in %i minutes",
"in memory to enable editing!",
"insufficient content",
"into",
@@ -403,6 +406,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"name",
"non-triangle face",
"normal",
"on {:%Y-%m-%d}",
"or AMD with macOS %s or newer",
"performance impact!",
"positions", "no positions",
@@ -433,6 +437,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"view",
"virtual parents",
"which was replaced by the Asset Browser",
"within seconds",
"write",
}
WARN_MSGID_NOT_CAPITALIZED_ALLOWED |= set(lng[2] for lng in LANGUAGES)

8
scripts/modules/bl_i18n_utils/utils_spell_check.py
View File

@@ -108,6 +108,7 @@ class SpellChecker:
"dataset", "datasets",
"de",
"deadzone",
"decomposable",
"deconstruct",
"defocus",
"denoise", "denoised", "denoising", "denoiser",
@@ -196,7 +197,7 @@ class SpellChecker:
"restpose",
"resync", "resynced",
"retarget", "retargets", "retargeting", "retargeted",
"retiming",
"retime", "retimed", "retiming",
"rigidbody",
"ringnoise",
"rolloff",
@@ -243,6 +244,7 @@ class SpellChecker:
"undeformed",
"undistort", "undistorted", "undistortion",
"ungroup", "ungrouped",
"unhandled",
"unhide",
"unindent",
"unitless",
@@ -525,6 +527,7 @@ class SpellChecker:
"refractions",
"remesher", "remeshing", "remesh",
"renderfarm",
"retopology",
"scanfill",
"shader", "shaders",
"shadowmap", "shadowmaps",
@@ -748,6 +751,7 @@ class SpellChecker:
"rgb", "rgba",
"rhs",
"rv",
"sdf",
"sdl",
"sdls",
"sl",
@@ -805,10 +809,12 @@ class SpellChecker:
"ffmpeg",
"flac",
"gltf",
"gprim", # From USD.
"gzip",
"ico",
"jpg", "jpeg", "jpegs",
"json",
"lightwave",
"lzw",
"matroska",
"mdd",

4
source/blender/editors/animation/anim_channels_edit.c
View File

@@ -3843,7 +3843,7 @@ static int graphkeys_view_selected_channels_exec(bContext *C, wmOperator *op)
if (!valid_bounds) {
ANIM_animdata_freelist(&anim_data);
WM_report(RPT_WARNING, "No keyframes to focus on.");
WM_report(RPT_WARNING, "No keyframes to focus on");
return OPERATOR_CANCELLED;
}
@@ -3931,7 +3931,7 @@ static int graphkeys_channel_view_pick_invoke(bContext *C, wmOperator *op, const
if (!found_bounds) {
ANIM_animdata_freelist(&anim_data);
WM_report(RPT_WARNING, "No keyframes to focus on.");
WM_report(RPT_WARNING, "No keyframes to focus on");
return OPERATOR_CANCELLED;
}

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

@@ -8351,7 +8351,7 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s
*/
if (state != BUTTON_STATE_TEXT_EDITING) {
WM_report(RPT_INFO,
"Can't edit driven number value, see driver editor for the driver setup.");
"Can't edit driven number value, see driver editor for the driver setup");
}
}

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

@@ -934,7 +934,7 @@ static void quadriflow_end_job(void *customdata)
WM_reportf(RPT_ERROR, "QuadriFlow: Remeshing failed");
break;
case -1:
WM_report(RPT_WARNING, "QuadriFlow: Remeshing cancelled");
WM_report(RPT_WARNING, "QuadriFlow: Remeshing canceled");
break;
case -2:
WM_report(RPT_WARNING,

2
source/blender/editors/space_graph/graph_slider_ops.c
View File

@@ -319,7 +319,7 @@ static int graph_slider_invoke(bContext *C, wmOperator *op, const wmEvent *event
ED_slider_init(gso->slider, event);
if (gso->bezt_arr_list.first == NULL) {
WM_report(RPT_ERROR, "Cannot find keys to operate on.");
WM_report(RPT_ERROR, "Cannot find keys to operate on");
graph_slider_exit(C, op);
return OPERATOR_CANCELLED;
}

2
source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.c
View File

@@ -286,7 +286,7 @@ static int lineart_gpencil_bake_common(bContext *C,
if (!bake_all_targets) {
Object *ob = CTX_data_active_object(C);
if (!ob || ob->type != OB_GPENCIL_LEGACY) {
WM_report(RPT_ERROR, "No active object or active object isn't a GPencil object.");
WM_report(RPT_ERROR, "No active object or active object isn't a GPencil object");
return OPERATOR_FINISHED;
}
BLI_linklist_prepend(&bj->objects, ob);

2
source/blender/io/alembic/intern/alembic_capi.cc
View File

@@ -656,7 +656,7 @@ static void import_endjob(void *user_data)
data->import_ok = !data->was_cancelled;
break;
case ABC_ARCHIVE_FAIL:
WM_report(RPT_ERROR, "Could not open Alembic archive for reading! See console for detail.");
WM_report(RPT_ERROR, "Could not open Alembic archive for reading, see console for detail");
break;
}

6
source/blender/io/ply/importer/ply_import.cc
View File

@@ -188,17 +188,17 @@ void importer_main(Main *bmain,
std::unique_ptr<PlyData> data = import_ply_data(file, header);
if (data == nullptr) {
fprintf(stderr, "PLY Importer: failed importing %s, unknown error\n", ob_name);
BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error.");
BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error");
return;
}
if (!data->error.empty()) {
fprintf(stderr, "PLY Importer: failed importing %s: %s\n", ob_name, data->error.c_str());
BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error.");
BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, unknown error");
return;
}
if (data->vertices.is_empty()) {
fprintf(stderr, "PLY Importer: file %s contains no vertices\n", ob_name);
BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, no vertices.");
BKE_report(op->reports, RPT_ERROR, "PLY Importer: failed importing, no vertices");
return;
}

5
source/blender/io/usd/intern/usd_asset_utils.cc
View File

@@ -89,8 +89,7 @@ static std::string copy_asset_to_directory(const char *src_path,
}
if (!copy_asset(src_path, dest_file_path, name_collision_mode)) {
WM_reportf(
RPT_WARNING, "%s: Couldn't copy file %s to %s.", __func__, src_path, dest_file_path);
WM_reportf(RPT_WARNING, "%s: Couldn't copy file %s to %s", __func__, src_path, dest_file_path);
return src_path;
}
@@ -179,7 +178,7 @@ bool copy_asset(const char *src, const char *dst, eUSDTexNameCollisionMode name_
std::string why_not;
if (!ar.CanWriteAssetToPath(dst_path, &why_not)) {
WM_reportf(RPT_ERROR,
"%s: Can't write to asset %s. %s.",
"%s: Can't write to asset %s: %s",
__func__,
dst_path.GetPathString().c_str(),
why_not.c_str());

2
source/blender/io/usd/intern/usd_capi_import.cc
View File

@@ -372,7 +372,7 @@ static void import_endjob(void *customdata)
data->import_ok = !data->was_canceled;
break;
case USD_ARCHIVE_FAIL:
WM_report(RPT_ERROR, "Could not open USD archive for reading! See console for detail.");
WM_report(RPT_ERROR, "Could not open USD archive for reading, see console for detail");
break;
}

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

@@ -4921,7 +4921,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Timecode Style",
"Format of timecodes displayed when not displaying timing in terms of frames");
"Format of timecode displayed when not displaying timing in terms of frames");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "view_frame_type", PROP_ENUM, PROP_NONE);