Merge branch 'master' into blender2.8

2016-06-29 17:45:16 +02:00
parent b90b02a480 903cb13bb8
commit f45fbf4b83
28 changed files with 302 additions and 217 deletions
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -58,7 +58,6 @@ class SpellChecker:
        "vertices",

        # Merged words
-        #~ "addon", "addons",
        "antialiasing",
        "arcsine", "arccosine", "arctangent",
        "autoclip",
@@ -127,6 +126,7 @@ class SpellChecker:
        "multipaint",
        "multires", "multiresolution",
        "multisampling",
+        "multiscatter",
        "multitexture",
        "multithreaded", 
        "multiuser",
@@ -530,6 +530,7 @@ class SpellChecker:
        "futura",
        "fx",
        "gfx",
+        "ggx",
        "gl",
        "glsl",
        "gpl",