Merge branch 'master' into blender2.8

2018-07-03 06:58:34 +02:00
parent e856eb7e8b 8c15d612a5
commit 00fc1d70a7
56 changed files with 757 additions and 622 deletions
--- a/source/blender/python/simple_enum_gen.py
+++ b/source/blender/python/simple_enum_gen.py
@@ -50,8 +50,10 @@ for d in defs.split('\n'):
    if not w:
        continue

-    try:		w.remove("#define")
-    except:	pass
+    try:
+        w.remove("#define")
+    except:
+        pass

    # print w