From d6cafda3bbd428966b1d74c8798698e5a6ca1ebd Mon Sep 17 00:00:00 2001 From: Alaska Date: Tue, 7 Nov 2023 07:45:36 +0100 Subject: [PATCH 1/4] Fix #114491: Incorrect HDR tooltip Mention that AgX also doesn't produce HDR information for the HDR display feature on macOS. Pull Request: https://projects.blender.org/blender/blender/pulls/114502 --- source/blender/makesrna/intern/rna_color.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_color.cc b/source/blender/makesrna/intern/rna_color.cc index c769668912e..3257e2dc2c3 100644 --- a/source/blender/makesrna/intern/rna_color.cc +++ b/source/blender/makesrna/intern/rna_color.cc @@ -1285,7 +1285,7 @@ static void rna_def_colormanage(BlenderRNA *brna) "High Dynamic Range", "Enable high dynamic range display in rendered viewport, uncapping display brightness. This " "requires a monitor with HDR support and a view transform designed for HDR. " - "'Filmic' does not generate HDR colors"); + "'Filmic' and 'AgX' do not generate HDR colors"); RNA_def_property_update(prop, NC_WINDOW, "rna_ColorManagedColorspaceSettings_reload_update"); /* ** Color-space ** */ From 967e36cf6853bd454d6c9e5ccdadbdcdafaa003a Mon Sep 17 00:00:00 2001 From: Alaska Date: Tue, 7 Nov 2023 07:48:54 +0100 Subject: [PATCH 2/4] UI: Don't show HDR setting when using False Color view transform False Color view transforms doesn't show HDR values. Pull Request: https://projects.blender.org/blender/blender/pulls/114503 --- scripts/startup/bl_ui/properties_render.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/startup/bl_ui/properties_render.py b/scripts/startup/bl_ui/properties_render.py index 74ef1792188..087dd0163dc 100644 --- a/scripts/startup/bl_ui/properties_render.py +++ b/scripts/startup/bl_ui/properties_render.py @@ -111,8 +111,8 @@ class RENDER_PT_color_management_display_settings(RenderButtonsPanel, Panel): # Only display HDR toggle for non-Filmic display transforms. col = layout.column(align=True) sub = col.row() - sub.active = (not view.view_transform.startswith("Filmic") and - not view.view_transform.startswith("AgX")) + sub.active = (not view.view_transform.startswith("Filmic") and not view.view_transform.startswith("AgX") and not + view.view_transform.startswith("False Color")) sub.prop(view, "use_hdr_view") From bbb71f0859e1109779db25638f12c0f37de95443 Mon Sep 17 00:00:00 2001 From: Jason Fielder Date: Tue, 7 Nov 2023 07:53:20 +0100 Subject: [PATCH 3/4] Metal: Ensure pending MTLSafeFreeList is released on shutdown Ensure that on closing of the application, all pending SafeFreeLists are released. A new change to ensure release of SafeFreeLists was always deferred until full completion of GPU buffers meant that a pending MTLSafeFreeList container may not be released on shutdown. This change ensures that the container is fully destructed on final shutdown. Authored by Apple: Michael Parkin-White Pull Request: https://projects.blender.org/blender/blender/pulls/114532 --- source/blender/gpu/metal/mtl_memory.mm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/blender/gpu/metal/mtl_memory.mm b/source/blender/gpu/metal/mtl_memory.mm index b2ddefe13fa..c95c6a6f113 100644 --- a/source/blender/gpu/metal/mtl_memory.mm +++ b/source/blender/gpu/metal/mtl_memory.mm @@ -70,10 +70,17 @@ void MTLBufferPool::free() delete completed_safelist_queue_[safe_pool_free_index]; } completed_safelist_queue_.clear(); + + safelist_lock_.lock(); if (current_free_list_ != nullptr) { delete current_free_list_; current_free_list_ = nullptr; } + if (prev_free_buffer_list_ != nullptr) { + delete prev_free_buffer_list_; + prev_free_buffer_list_ = nullptr; + } + safelist_lock_.unlock(); /* Clear and release memory pools. */ for (std::multiset *buffer_pool : From 0eb279de54ffbfe574b9b61c767b17ebbc53b911 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Tue, 7 Nov 2023 10:11:30 +0100 Subject: [PATCH 4/4] Fix #66286: DblClick to rename UIList items within a popover not working Looks like most of `ui_apply_but_XXX` or `ui_do_but_XXX` functions rely on `uiHandleButtonData` (and not necessarily context). Now the problem from a popover in `ui_but_list_row_text_activate` was that the label button to be set in BUTTON_ACTIVATE_TEXT_EDITING for renaming could not be found because it was using the "wrong" region from context (`CTX_wm_region` - which still seem to point to the region the popover was spawned from). The correct region is available in `uiHandleButtonData` though, so now use this instead. Not totally sure if `CTX_wm_region` should actually be correct in all cases - which would hint at an underlying problem of not setting it right - but since other functions rely on `uiHandleButtonData` as well, this fix seems to make sense. Fix should go into LTS I think. Pull Request: https://projects.blender.org/blender/blender/pulls/114363 --- source/blender/editors/interface/interface_handlers.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index 9d35506430c..597f9b15160 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -4412,7 +4412,7 @@ static uiBut *ui_but_list_row_text_activate(bContext *C, const wmEvent *event, uiButtonActivateType activate_type) { - ARegion *region = CTX_wm_region(C); + ARegion *region = data->region; uiBut *labelbut = ui_but_find_mouse_over_ex(region, event->xy, true, false, nullptr, nullptr); if (labelbut && labelbut->type == UI_BTYPE_TEXT && !(labelbut->flag & UI_BUT_DISABLED)) {