Merge branch 'blender-v4.1-release'
This commit is contained in:
@@ -57,6 +57,10 @@ static std::string ui_view_drop_tooltip(bContext *C,
|
||||
const ARegion *region = CTX_wm_region(C);
|
||||
std::unique_ptr<DropTargetInterface> drop_target = region_views_find_drop_target_at(region, xy);
|
||||
|
||||
if (drop_target == nullptr) {
|
||||
return {};
|
||||
}
|
||||
|
||||
return drop_target_tooltip(*region, *drop_target, *drag, *win->eventstate);
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user