Merge branch 'master' into blender2.8

2017-06-12 15:09:33 +02:00
parent f52dc2f371 d8957e4cce
commit 0f4f4d8754
114 changed files with 1532 additions and 480 deletions
--- a/tests/python/bl_alembic_import_test.py
+++ b/tests/python/bl_alembic_import_test.py
@@ -207,7 +207,7 @@ def main():
    import argparse

    if '--' in sys.argv:
-        argv = [sys.argv[0]] + sys.argv[sys.argv.index('--')+1:]
+        argv = [sys.argv[0]] + sys.argv[sys.argv.index('--') + 1:]
    else:
        argv = sys.argv