diff --git a/check_source/check_spelling_c_config.py b/check_source/check_spelling_c_config.py index ff0c9618eb348507483e9a6e43e132e511548a32..3e250318c698c0e3bcd3704aff17938f56e50ee2 100644 --- a/check_source/check_spelling_c_config.py +++ b/check_source/check_spelling_c_config.py @@ -87,9 +87,11 @@ dict_custom = { "registerable", "rendeder", "reparametization", + "sidedness", "subclass", "subclasses", "subclassing", "subdirectory", "tertiarily", + "unassign", "unbuffered", "unclamped", "uncomment", diff --git a/utils/blender_merge_format_changes.py b/utils/blender_merge_format_changes.py index 014373be89b00ef107994cc540868d33006b2425..8b2a86161b8662096d064464dea30581d8adb805 100755 --- a/utils/blender_merge_format_changes.py +++ b/utils/blender_merge_format_changes.py @@ -101,7 +101,7 @@ if code != 0: # Otherwise create a commit for formatting. os.system('git commit -m "Cleanup: apply clang format"') -# Rebase remaning commits +# Rebase remaining commits code = os.system('git ' + mode_cmd + ' ' + base_branch) if code != 0: print("BLENDER MERGE: resolve conflicts, complete " + mode + " and you're done")