Merge branch 'blender-v4.4-release'

scripts/startup/bl_ui/properties_collection.py

@@ -42,7 +42,6 @@ class COLLECTION_PT_collection_flags(CollectionButtonsPanel, Panel):
 
         col = layout.column(align=True)
         col.prop(collection, "hide_select", text="Selectable", toggle=False, invert_checkbox=True)
-        col.prop(collection, "hide_viewport", toggle=False)
         col.prop(collection, "hide_render", toggle=False)
 
         col = layout.column(align=True)

source/blender/blenkernel/intern/layer.cc

@@ -1418,7 +1418,10 @@ void BKE_layer_collection_sync(const Scene *scene, ViewLayer *view_layer)
 
   /* Always set a valid active collection. */
   LayerCollection *active = view_layer->active_collection;
-  if (active == nullptr) {
+  if (active && layer_collection_hidden(view_layer, active)) {
+    BKE_layer_collection_activate_parent(view_layer, active);
+  }
+  else if (active == nullptr) {
     view_layer->active_collection = static_cast<LayerCollection *>(
         view_layer->layer_collections.first);
   }

source/blender/editors/animation/anim_filter.cc

@@ -3394,7 +3394,6 @@ static size_t animdata_filter_dopesheet_scene(bAnimContext *ac,
   /* filter data contained under object first */
   BEGIN_ANIMFILTER_SUBCHANNELS (EXPANDED_SCEC(sce)) {
     bNodeTree *ntree = sce->nodetree;
-    bGPdata *gpd = sce->gpd;
     World *wo = sce->world;
 
     /* Action, Drivers, or NLA for Scene */
@@ -3417,11 +3416,6 @@ static size_t animdata_filter_dopesheet_scene(bAnimContext *ac,
       tmp_items += animdata_filter_ds_linestyle(ac, &tmp_data, sce, filter_mode);
     }
 
-    /* grease pencil */
-    if ((gpd) && !(ac->ads->filterflag & ADS_FILTER_NOGPENCIL)) {
-      tmp_items += animdata_filter_ds_gpencil(ac, &tmp_data, gpd, filter_mode);
-    }
-
     /* TODO: one day, when sequencer becomes its own datatype,
      * perhaps it should be included here. */
   }
@@ -3667,6 +3661,15 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac,
     }
   }
 
+  /* Annotations are always shown if "Only Show Selected" is disabled. This works in the Timeline
+   * as well as in the Dope Sheet.*/
+  if (!(ac->ads->filterflag & ADS_FILTER_ONLYSEL) && !(ac->ads->filterflag & ADS_FILTER_NOGPENCIL))
+  {
+    LISTBASE_FOREACH (bGPdata *, gp_data, &ac->bmain->gpencils) {
+      items += animdata_filter_ds_gpencil(ac, anim_data, gp_data, filter_mode);
+    }
+  }
+
   /* movie clip's animation */
   if (!(ac->ads->filterflag2 & ADS_FILTER_NOMOVIECLIPS) &&
       !(ac->ads->filterflag & ADS_FILTER_ONLYSEL))

source/blender/editors/interface/interface_handlers.cc

@@ -957,6 +957,12 @@ static void ui_apply_but_undo(uiBut *but)
     return;
   }
 
+  /* Skip undo push for buttons in redo panel, see: #134505. */
+  const ARegion *region = CTX_wm_region(static_cast<bContext *>(but->block->evil_C));
+  if (region->regiontype == RGN_TYPE_HUD) {
+    return;
+  }
+
   std::optional<StringRef> str;
   size_t str_len_clip = SIZE_MAX - 1;
   bool skip_undo = false;

source/blender/editors/space_node/space_node.cc

@@ -963,6 +963,11 @@ static void node_region_listener(const wmRegionListenerParams *params)
           break;
       }
       break;
+    case NC_ANIMATION:
+      if (wmn->data == ND_NLA_ACTCHANGE) {
+        ED_region_tag_redraw(region);
+      }
+      break;
     case NC_SCREEN:
       if (wmn->data == ND_LAYOUTSET || wmn->action == NA_EDITED) {
         WM_gizmomap_tag_refresh(gzmap);