Merge branch 'blender-v4.1-release' into main

This commit is contained in:
Brecht Van Lommel 2024-02-20 19:19:00 +01:00
commit c28038d970
2 changed files with 4 additions and 2 deletions

View File

@ -4,6 +4,8 @@
#pragma once
#include <memory>
#include "DEG_depsgraph.hh"
#include "RNA_types.hh"

View File

@ -429,7 +429,7 @@ class Report:
"-o", diff_color_img,
)
try:
subprocess.check_output(command)
subprocess.check_output(command, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
if self.verbose:
print_message(e.output.decode("utf-8", 'ignore'))
@ -447,7 +447,7 @@ class Report:
"-o", diff_alpha_img,
)
try:
subprocess.check_output(command)
subprocess.check_output(command, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
if self.verbose:
msg = e.output.decode("utf-8", 'ignore')