diff options
author | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
commit | 5f621a12c6d14d6ec0439992bc0c2590a2bd4760 (patch) | |
tree | 7143836d4095c1260f4afee06132ffd72ccabcaa /release/scripts | |
parent | ca606bf55165881896467f6a5c09e5870c847fbb (diff) | |
parent | 701a9d39175e0d3e5e2f776821f1251b8a7a5f78 (diff) |
Merge branch 'blender-v2.90-release'
Conflicts:
source/blender/editors/gpencil/gpencil_primitive.c
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/utils_spell_check.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py index aa80611ac6b..0ec3a322173 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -72,7 +72,7 @@ class SpellChecker: "wasn", # wasn't # Merged words - "antialiasing", + "antialiasing", "antialias", "arcsine", "arccosine", "arctangent", "autoclip", "autocomplete", @@ -241,7 +241,7 @@ class SpellChecker: "unsets", "unshadowed", "unspill", - "unstitchable", + "unstitchable", "unstitch", "unsubdivided", "unsubdivide", "untrusted", "vectorscope", @@ -421,6 +421,7 @@ class SpellChecker: "searchable", "spacebar", "subtractive", + "superellipse", "tooltip", "tooltips", "trackpad", "tuple", @@ -618,6 +619,7 @@ class SpellChecker: "musgrave", "nayar", "netravali", + "nishita", "ogawa", "oren", "peucker", # Ramer-Douglas-Peucker |