Merge branch 'blender-v4.1-release'

2024-02-16 08:40:51 -08:00
parent 44e695192a 5ba104ac46
commit 7d1747819f
2 changed files with 9 additions and 1 deletions
--- a/tests/python/modules/render_report.py
+++ b/tests/python/modules/render_report.py
@@ -450,7 +450,11 @@ class Report:
            subprocess.check_output(command)
        except subprocess.CalledProcessError as e:
            if self.verbose:
-                print_message(e.output.decode("utf-8", 'ignore'))
+                msg = e.output.decode("utf-8", 'ignore')
+                for line in msg.splitlines():
+                    # Ignore warnings for images without alpha channel.
+                    if "--ch: Unknown channel name" not in line:
+                        print_message(line)

        return not failed