1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI/Code: Fix typos and other UI messages issues.

Browse Source
This commit is contained in:
Bastien Montagne 2024-01-08 12:03:35 +01:00
parent dddf1ba32a
commit d13edee3e0
8 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,6 +345,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"author", # Addons' field. :/
"bItasc",
"blender.org",
"bytes",
"color_index is invalid",
"cos(A)",
"cosh(A)",
@ -364,6 +365,8 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"glTF Material Output",
"glTF Original PBR data",
"glTF Separate (.gltf + .bin + textures)",
"gltfpack",
"glTFpack file path",
"invoke() needs to be called before execute()",
"iScale",
"iso-8859-15",
@ -383,10 +386,13 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"ogg",
"oneAPI",
"p0",
"parent_index should not be less than -1: %d",
"parent_index (%d) should be less than the number of bone collections (%d)",
"px",
"re",
"res",
"rv",
"seconds",
"sin(A)",
"sin(x) / x",
"sinh(A)",

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

@ -32,9 +32,11 @@ class SpellChecker:
"duplications",
"effector",
"equi", # equi-angular, etc.
"eszett", # German Eszett
"et", # et al.
"fader",
"globbing",
"guillemet",
"gridded",
"haptics",
"hasn", # hasn't
@ -49,6 +51,7 @@ class SpellChecker:
"kyrgyz",
"latin",
"merchantability",
"mille", # Per Mille
"mplayer",
"ons", # add-ons
"pong", # ping pong
@ -193,6 +196,7 @@ class SpellChecker:
"raytree",
"readonly",
"realtime",
"recompute", "recomputation",
"reinject", "reinjected",
"rekey",
"relink",
@ -233,6 +237,7 @@ class SpellChecker:
"subsize",
"substep", "substeps",
"substring",
"supercompress", "supercompression",
"targetless",
"textbox", "textboxes",
"tilemode",
@ -451,6 +456,7 @@ class SpellChecker:
"parametrization",
"pheomelanin",
"photoreceptor",
"picometer", "picometers",
"poly",
"polyline", "polylines",
"probabilistically",
@ -670,7 +676,7 @@ class SpellChecker:
"ptcache",
"dpaint",
# Algorithm/library names
# Algorithm/library/tools names
"ashikhmin", # Ashikhmin-Shirley
"arsloe", # Texel-Marsen-Arsloe
"beckmann",
@ -688,6 +694,7 @@ class SpellChecker:
"devlin",
"embree",
"gmp",
"gltfpack",
"hosek",
"kutta",
"kuwahara",

4
source/blender/animrig/ANIM_bone_collections.hh
View File

@ -355,9 +355,9 @@ bool armature_bonecoll_is_child_of(const bArmature *armature,
int potential_parent_index,
int potential_child_index);
bool armature_bonecoll_is_decendent_of(const bArmature *armature,
bool armature_bonecoll_is_descendant_of(const bArmature *armature,
int potential_parent_index,
int potential_decendent_index);
int potential_descendant_index);
bool bonecoll_has_children(const BoneCollection *bcoll);

8
source/blender/animrig/intern/bone_collections.cc
View File

@ -1150,11 +1150,11 @@ bool armature_bonecoll_is_child_of(const bArmature *armature,
potential_child_index < upper_bound;
}
bool armature_bonecoll_is_decendent_of(const bArmature *armature,
bool armature_bonecoll_is_descendant_of(const bArmature *armature,
const int potential_parent_index,
const int potential_decendent_index)
const int potential_descendant_index)
{
if (armature_bonecoll_is_child_of(armature, potential_parent_index, potential_decendent_index)) {
if (armature_bonecoll_is_child_of(armature, potential_parent_index, potential_descendant_index)) {
/* Found a direct child. */
return true;
}
@ -1163,7 +1163,7 @@ bool armature_bonecoll_is_decendent_of(const bArmature *armature,
const int upper_bound = potential_parent->child_index + potential_parent->child_count;
for (int visit_index = potential_parent->child_index; visit_index < upper_bound; visit_index++) {
if (armature_bonecoll_is_decendent_of(armature, visit_index, potential_decendent_index)) {
if (armature_bonecoll_is_descendant_of(armature, visit_index, potential_descendant_index)) {
return true;
}
}

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

@ -106,7 +106,7 @@ class BoneCollectionDropTarget : public TreeViewItemDropTarget {
}
/* Do not allow dropping onto its own descendants. */
if (armature_bonecoll_is_decendent_of(
if (armature_bonecoll_is_descendant_of(
drag_arm_bcoll->armature, drag_arm_bcoll->bcoll_index, drop_bonecoll_.bcoll_index))
{
*r_disabled_hint = "Cannot drag a collection onto a descendent";

4
source/blender/editors/space_graph/graph_slider_ops.cc
View File

@ -2287,8 +2287,8 @@ void GRAPH_OT_push_pull(wmOperatorType *ot)
* \{ */
static const EnumPropertyItem scale_anchor_items[] = {
{int(FCurveSegmentAnchor::LEFT), "LEFT", 0, "From Left", "foo"},
{int(FCurveSegmentAnchor::RIGHT), "RIGHT", 0, "From Right", "foo"},
{int(FCurveSegmentAnchor::LEFT), "LEFT", 0, "From Left", ""},
{int(FCurveSegmentAnchor::RIGHT), "RIGHT", 0, "From Right", ""},
{0, nullptr, 0, nullptr, nullptr},
};

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

@ -116,7 +116,7 @@ void create_skel_roots(pxr::UsdStageRefPtr stage, const USDExportParams &params)
RPT_WARNING,
"%s: Couldn't find a common Xform ancestor for skinned prim %s "
"and skeleton %s to convert to a USD SkelRoot. "
"This can be addressed by setting a root primitive in the export options.\n",
"This can be addressed by setting a root primitive in the export options",
__func__,
prim.GetPath().GetAsString().c_str(),
skel.GetPath().GetAsString().c_str());

4
source/blender/makesrna/intern/rna_armature.cc
View File

@ -282,9 +282,9 @@ static void rna_BoneCollection_parent_set(PointerRNA *ptr,
const int to_parent_index = armature_bonecoll_find_index(armature, to_parent);
if (to_parent_index == from_bcoll_index ||
armature_bonecoll_is_decendent_of(armature, from_bcoll_index, to_parent_index))
armature_bonecoll_is_descendant_of(armature, from_bcoll_index, to_parent_index))
{
BKE_report(reports, RPT_ERROR, "Cannot make a bone collection a decendent of itself");
BKE_report(reports, RPT_ERROR, "Cannot make a bone collection a descendant of itself");
return;
}