From f9aa5b4d805e4b2fc87c9db378ec2b408e75b5c7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 7 Apr 2020 21:33:02 +1000
Subject: [PATCH] check_spelling_c_config: add words
---
check_source/check_spelling_c_config.py | 2 ++
utils/blender_merge_format_changes.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/check_source/check_spelling_c_config.py b/check_source/check_spelling_c_config.py
index ff0c961..3e25031 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 014373b..8b2a861 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")
--
GitLab