diff --git a/scripts/addons_core/ui_translate/settings.py b/scripts/addons_core/ui_translate/settings.py index 23d3b23aa91..a88ad7eb372 100644 --- a/scripts/addons_core/ui_translate/settings.py +++ b/scripts/addons_core/ui_translate/settings.py @@ -26,7 +26,7 @@ settings = settings_i18n.I18nSettings() # Operators ################################################################### class UI_OT_i18n_settings_load(Operator): - """Load translations' settings from a persistent JSon file""" + """Load translations' settings from a persistent JSON file""" bl_idname = "ui.i18n_settings_load" bl_label = "I18n Load Settings" bl_option = {'REGISTER'} @@ -58,7 +58,7 @@ class UI_OT_i18n_settings_load(Operator): class UI_OT_i18n_settings_save(Operator): - """Save translations' settings in a persistent JSon file""" + """Save translations' settings in a persistent JSON file""" bl_idname = "ui.i18n_settings_save" bl_label = "I18n Save Settings" bl_option = {'REGISTER'} diff --git a/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/scripts/modules/bl_i18n_utils/bl_extract_messages.py index 24fed272503..026dc564fda 100644 --- a/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -1248,7 +1248,7 @@ def main(): parser.add_argument('-m', '--no_messages', default=True, action="store_false", help="No export of UI messages.") parser.add_argument('-o', '--output', default=None, help="Output POT file path.") parser.add_argument('-s', '--settings', default=None, - help="Override (some) default settings. Either a JSon file name, or a JSon string.") + help="Override (some) default settings. Either a JSON file name, or a JSON string.") args = parser.parse_args(argv) settings = settings_i18n.I18nSettings() diff --git a/scripts/modules/bl_i18n_utils/settings.py b/scripts/modules/bl_i18n_utils/settings.py index 92ff288c25a..9211cbd87ca 100644 --- a/scripts/modules/bl_i18n_utils/settings.py +++ b/scripts/modules/bl_i18n_utils/settings.py @@ -716,7 +716,7 @@ def _check_valid_data(uid, val): class I18nSettings: """ Class allowing persistence of our settings! - Saved in JSon format, so settings should be JSon'able objects! + Saved in JSON format, so settings should be JSON'able objects! """ _settings = None @@ -763,7 +763,7 @@ class I18nSettings: return if isinstance(fname, str): if not os.path.isfile(fname): - # Assume it is already real JSon string... + # Assume it is already real JSON string. self.from_json(fname) return with open(fname, encoding="utf8") as f: diff --git a/scripts/modules/bl_i18n_utils/utils_cli.py b/scripts/modules/bl_i18n_utils/utils_cli.py index 0b749b1a069..29082920499 100644 --- a/scripts/modules/bl_i18n_utils/utils_cli.py +++ b/scripts/modules/bl_i18n_utils/utils_cli.py @@ -86,7 +86,7 @@ def main(): parser = argparse.ArgumentParser(description="Tool to perform common actions over PO/MO files.") parser.add_argument( '-s', '--settings', default=None, - help="Override (some) default settings. Either a JSon file name, or a JSon string.", + help="Override (some) default settings. Either a JSON file name, or a JSON string.", ) sub_parsers = parser.add_subparsers() diff --git a/scripts/modules/bpy_extras/mesh_utils.py b/scripts/modules/bpy_extras/mesh_utils.py index 0fdc41c7f6f..0485e0557c8 100644 --- a/scripts/modules/bpy_extras/mesh_utils.py +++ b/scripts/modules/bpy_extras/mesh_utils.py @@ -399,7 +399,7 @@ def ngon_tessellate(from_data, indices, fix_loops=True, debug_print=True): if not fill: if debug_print: - print('Warning Cannot scanfill, fallback on a triangle fan.') + print('Warning Cannot scan-fill, fallback on a triangle fan.') fill = [[0, i - 1, i] for i in range(2, len(indices))] else: # Use real scan-fill. diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc index 85cb09b11c1..0241db0c1e3 100644 --- a/source/blender/sequencer/intern/render.cc +++ b/source/blender/sequencer/intern/render.cc @@ -1454,10 +1454,10 @@ static ImBuf *seq_render_scene_strip(const RenderData *context, use_gpencil = false; } - /* prevent eternal loop */ + /* Prevent eternal loop. */ scene->r.scemode &= ~R_DOSEQ; - /* stooping to new low's in hackyness :( */ + /* Temporarily disable camera switching to enforce using `camera`. */ scene->r.mode |= R_NO_CAMERA_SWITCH; is_frame_update = (orig_data.timeline_frame != scene->r.cfra) || @@ -1606,7 +1606,6 @@ finally: BKE_scene_graph_update_for_newframe(depsgraph); } - /* stooping to new low's in hackyness :( */ scene->r.mode &= orig_data.mode | ~R_NO_CAMERA_SWITCH; return ibuf; diff --git a/tools/check_source/check_spelling_config.py b/tools/check_source/check_spelling_config.py index 5ea025f1d65..3baaa3a11d1 100644 --- a/tools/check_source/check_spelling_config.py +++ b/tools/check_source/check_spelling_config.py @@ -905,6 +905,8 @@ dict_ignore_hyphenated_suffix = { } files_ignore = { + "scripts/modules/bl_i18n_utils/utils_spell_check.py", # UI spelling, doesn't always match code spelling. + "tools/utils/git_data_canonical_authors.py", # Too many names which aren't in the dictionary. "tools/utils_doc/rna_manual_reference_updater.py", # Contains language ID references. # Maintained by 3rd parties. diff --git a/tools/utils/blend2json.py b/tools/utils/blend2json.py index e570099fd7f..37b1126490b 100755 --- a/tools/utils/blend2json.py +++ b/tools/utils/blend2json.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later """ -This is a tool for generating a JSon version of a blender file (only its structure, or all its data included). +This is a tool for generating a JSON version of a blender file (only its structure, or all its data included). It can also run some simple validity checks over a .blend file. @@ -27,7 +27,7 @@ making diff pretty noisy): ./blend2json.py --no-old-addresses foo.blend -To check a .blend file instead of outputting its JSon version (use explicit -o option to do both at the same time): +To check a .blend file instead of outputting its JSON version (use explicit -o option to do both at the same time): ./blend2json.py -c foo.blend @@ -331,7 +331,7 @@ def check_file(args, blend): addr_old = set() for block in blend.blocks: if block.addr_old in addr_old: - print("ERROR! Several data blocks share same 'addr_old' uuid %d, " + print("ERROR! Several data blocks share same 'addr_old' UUID %d, " "this should never happen!" % block.addr_old) continue addr_old.add(block.addr_old) @@ -366,7 +366,7 @@ def argparse_create(): parser.add_argument( "--no-old-addresses", dest="no_address", default=False, action='store_true', required=False, help=("Do not output old memory address of each block of data " - "(used as 'uuid' in .blend files, but change pretty noisily)")) + "(used as 'UUID' in .blend files, but change pretty noisily)")) parser.add_argument( "--no-fake-old-addresses", dest="use_fake_address", default=True, action='store_false', required=False, @@ -376,22 +376,22 @@ def argparse_create(): parser.add_argument( "--full-data", dest="full_data", default=False, action='store_true', required=False, - help=("Also put in JSon file data itself " + help=("Also put in JSON file data itself " "(WARNING! will generate *huge* verbose files - and is far from complete yet)")) parser.add_argument( "--filter-data", dest="filter_data", default=None, required=False, - help=("Only put in JSon file data fields which names match given comma-separated list " + help=("Only put in JSON file data fields which names match given comma-separated list " "(ignored if --full-data is set)")) parser.add_argument( "--full-dna", dest="full_dna", default=False, action='store_true', required=False, - help=("Also put in JSon file dna properties description (ignored when --compact-output is used)")) + help=("Also put in JSON file dna properties description (ignored when --compact-output is used)")) parser.add_argument( "--raw-bblock", dest="raw_bblock", default=False, action='store_true', required=False, - help=("Do not attempt to open and parse the Blendfile at a high level, but only handles its basic data layout " - "(usable when the given files are not valid blendfiles - e.g. corrupted ones)")) + help=("Do not attempt to open and parse the blend-file at a high level, but only handles its basic data layout " + "(usable when the given files are not valid blend-files - e.g. corrupted ones)")) group = parser.add_argument_group("Filters", FILTER_DOC) group.add_argument(