Merge branch 'master' into blender2.8

2017-10-11 13:14:16 +05:00
parent ef1918d312 4782000fd5
commit dc95c79971
27 changed files with 488 additions and 475 deletions
--- a/tests/python/cycles_render_tests.py
+++ b/tests/python/cycles_render_tests.py
@@ -43,7 +43,8 @@ def print_message(message, type=None, status=''):
        status_text = "  FAILED  "
    else:
        status_text = status
-    print("[{}]" . format(status_text), end="")
+    if status_text:
+        print("[{}]" . format(status_text), end="")
    print(COLORS.ENDC, end="")
    print(" {}" . format(message))
    sys.stdout.flush()