Merge branch 'master' into blender2.8

2018-10-09 08:46:00 +11:00
parent 11877e5bec 3bc885e5f4
commit 733e6c0b1d
17 changed files with 297 additions and 141 deletions
--- a/tests/python/modules/render_report.py
+++ b/tests/python/modules/render_report.py
@@ -374,7 +374,7 @@ class Report:
        testname = test_get_name(filepath)
        print_message(testname, 'SUCCESS', 'RUN')
        time_start = time.time()
-        tmp_filepath = os.path.join(self.output_dir, "tmp")
+        tmp_filepath = os.path.join(self.output_dir, "tmp_" + testname)

        error = render_cb(filepath, tmp_filepath)
        status = "FAIL"