Merge branch 'blender-v4.0-release'

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")
 
 

source/blender/editors/interface/interface_handlers.cc

@@ -4418,7 +4418,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)) {

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<blender::gpu::MTLBufferHandle, blender::gpu::CompareMTLBuffer> *buffer_pool :

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 ** */