From 66c6cbb5986553a1af5e11506a5e4638cabcf8de Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 16 Feb 2024 16:36:21 +0100 Subject: [PATCH 1/2] Tests: Silence warning about missing alpha channel in render tests Having this repeated many times makes it hard to spot actual issues. Pull Request: https://projects.blender.org/blender/blender/pulls/118355 --- tests/python/modules/render_report.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py index 537f5d2edca..20376c780dc 100755 --- 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 From 5ba104ac469807cee69478aaf58ba8f38692346d Mon Sep 17 00:00:00 2001 From: Pratik Borhade Date: Fri, 16 Feb 2024 17:39:21 +0100 Subject: [PATCH 2/2] Fix #114962: Tree view: Crash during tooltip creation Crash when dragging tree-item from one window to other instance of tree view, with drop_target then nullptr. Returning null in this case lets the process proceed normally and tooltip display correctly. Pull Request: https://projects.blender.org/blender/blender/pulls/116892 --- source/blender/editors/interface/interface_dropboxes.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc index 7ceb8ff5cbd..d43522cb392 100644 --- a/source/blender/editors/interface/interface_dropboxes.cc +++ b/source/blender/editors/interface/interface_dropboxes.cc @@ -58,6 +58,10 @@ static std::string ui_view_drop_tooltip(bContext *C, const ARegion *region = CTX_wm_region(C); std::unique_ptr 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); }