Merge branch 'master' into blender2.8

2018-06-29 08:05:38 +02:00
parent be983295ea af36dd4664
commit 9bd0c63382
263 changed files with 0 additions and 281 deletions
--- a/source/blender/python/simple_enum_gen.py
+++ b/source/blender/python/simple_enum_gen.py
@@ -59,7 +59,3 @@ for d in defs.split('\n'):
    py_val = w[0]

    print '\tPyModule_AddObject(mod, "%s", PyLong_FromSize_t(%s));' % (val, py_val)
-
-
-
-