diff --git a/scripts/modules/bl_i18n_utils/settings.py b/scripts/modules/bl_i18n_utils/settings.py index 50218f23cb6..bec1240a7ee 100644 --- a/scripts/modules/bl_i18n_utils/settings.py +++ b/scripts/modules/bl_i18n_utils/settings.py @@ -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)", diff --git a/scripts/modules/bl_i18n_utils/utils_spell_check.py b/scripts/modules/bl_i18n_utils/utils_spell_check.py index 01874439d30..18bd160e21b 100644 --- a/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -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", diff --git a/source/blender/animrig/ANIM_bone_collections.hh b/source/blender/animrig/ANIM_bone_collections.hh index 6caa5727aef..8277f93f483 100644 --- a/source/blender/animrig/ANIM_bone_collections.hh +++ b/source/blender/animrig/ANIM_bone_collections.hh @@ -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); diff --git a/source/blender/animrig/intern/bone_collections.cc b/source/blender/animrig/intern/bone_collections.cc index 18df5b9eba9..348b426fa14 100644 --- a/source/blender/animrig/intern/bone_collections.cc +++ b/source/blender/animrig/intern/bone_collections.cc @@ -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; } } diff --git a/source/blender/editors/interface/interface_template_bone_collection_tree.cc b/source/blender/editors/interface/interface_template_bone_collection_tree.cc index dd840dba377..38fa9825955 100644 --- a/source/blender/editors/interface/interface_template_bone_collection_tree.cc +++ b/source/blender/editors/interface/interface_template_bone_collection_tree.cc @@ -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"; diff --git a/source/blender/editors/space_graph/graph_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc index c747393d2cb..21d75a448cd 100644 --- a/source/blender/editors/space_graph/graph_slider_ops.cc +++ b/source/blender/editors/space_graph/graph_slider_ops.cc @@ -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}, }; diff --git a/source/blender/io/usd/intern/usd_skel_root_utils.cc b/source/blender/io/usd/intern/usd_skel_root_utils.cc index 4749a2d7d4f..74c26d819fc 100644 --- a/source/blender/io/usd/intern/usd_skel_root_utils.cc +++ b/source/blender/io/usd/intern/usd_skel_root_utils.cc @@ -116,7 +116,7 @@ void create_skel_roots(pxr::UsdStageRefPtr stage, const USDExportParams ¶ms) 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()); diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 1c4716e60c4..79d7b04df1b 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -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; }