diff options
author | Julian Eisel <julian@blender.org> | 2020-08-05 13:19:28 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-08-05 13:19:28 +0300 |
commit | fc9f7e3e51ae43a64917b7ef65e8210394220dfa (patch) | |
tree | fd4882774f97e667bfe5b4912db07867c0193af6 | |
parent | ec9ab00fcb6fa7bc2f2bcb7a11daadc527f83f41 (diff) | |
parent | c3113724ed7e0b758f381ddef4270ad129ff93e1 (diff) |
Merge branch 'blender-v2.90-release'
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 | ||||
-rw-r--r-- | tests/python/cycles_render_tests.py | 5 | ||||
-rwxr-xr-x | tests/python/modules/render_report.py | 11 |
3 files changed, 15 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index a339006bd08..d68a8f88686 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1401,7 +1401,7 @@ static void widget_draw_icon( } } else if (ELEM(but->type, UI_BTYPE_BUT)) { - if (but->flag & UI_BUT_DISABLED) { + if (but->flag & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) { alpha *= 0.5f; } } diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py index 79ba11fdd44..b2f0be2895f 100644 --- a/tests/python/cycles_render_tests.py +++ b/tests/python/cycles_render_tests.py @@ -63,6 +63,11 @@ def main(): report.set_pixelated(True) report.set_reference_dir("cycles_renders") report.set_compare_engines('cycles', 'eevee') + + # Increase threshold for motion blur, see T78777. + if test_dir == 'motion_blur': + report.set_fail_threshold(0.032) + ok = report.run(test_dir, blender, get_arguments, batch=True) sys.exit(not ok) diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py index 0cce1791a88..506c1a1518a 100755 --- a/tests/python/modules/render_report.py +++ b/tests/python/modules/render_report.py @@ -104,6 +104,8 @@ class Report: 'reference_dir', 'idiff', 'pixelated', + 'fail_threshold', + 'fail_percent', 'verbose', 'update', 'failed_tests', @@ -118,6 +120,8 @@ class Report: self.reference_dir = 'reference_renders' self.idiff = idiff self.compare_engines = None + self.fail_threshold = 0.016 + self.fail_percent = 1 self.pixelated = False self.verbose = os.environ.get("BLENDER_VERBOSE") is not None @@ -136,6 +140,9 @@ class Report: def set_pixelated(self, pixelated): self.pixelated = pixelated + def set_fail_threshold(self, threshold): + self.fail_threshold = threshold + def set_reference_dir(self, reference_dir): self.reference_dir = reference_dir @@ -366,8 +373,8 @@ class Report: # Diff images test with threshold. command = ( self.idiff, - "-fail", "0.016", - "-failpercent", "1", + "-fail", str(self.fail_threshold), + "-failpercent", str(self.fail_percent), ref_img, tmp_filepath, ) |