Avoid crashing when trying to delete an FCurve

@@ -198,0 +336,4 @@
+  /**
+   * Return the name prefix for the Binding's type.
+   *
+   * This is the ID name prefix, so "OB" for objects, "CA" for cameras, etc.

@@ -135,0 +598,4 @@
+    return "??";
+  }
+
+  static char name[3] = {0};

@@ -449,2 +469,2 @@
-/* quick macro to test if AnimData is usable */
-#define ANIMDATA_HAS_KEYS(id) ((id)->adt && (id)->adt->action)
+/* quick macro to test if AnimData has usable Action */
+#define ANIMDATA_HAS_KEYS(id) ((id)->adt && !(id)->adt->animation && (id)->adt->action)

@@ -457,3 +476,4 @@
+#define ANIMDATA_HAS_NLA(id) ((id)->adt && !(id)->adt->animation && (id)->adt->nla_tracks.first)
 
 /**
  * Quick macro to test for all three above usability tests, performing the appropriate provided

@@ -663,3 +735,1 @@
-        ale->datatype = ALE_ACT;
-
-        ale->adt = BKE_animdata_from_id(static_cast<ID *>(data));
+        key_data_from_adt(*ale, ma->adt);

@@ -1369,0 +1358,4 @@
+
+    /* bAnimListElem::binding_handle is exposed as int32_t and not as binding_handle_t, so better
+     * ensure that these are still equivalent. */
+    static_assert(std::is_same_v<decltype(AnimationBinding::handle),

@@ -385,9 +415,27 @@ short ANIM_animchannel_keyframes_loop(KeyframeEditData *ked,
      */
     case ALE_GROUP: /* action group */
       return agrp_keyframes_loop(ked, (bActionGroup *)ale->data, key_ok, key_cb, fcu_cb);
+    case ALE_ANIM: { /* Animation data-block. */

@@ -151,6 +151,7 @@ static int mouse_nla_tracks(bContext *C, bAnimContext *ac, int track_index, shor
       break;
     }
     case ANIMTYPE_FILLACTD: /* Action Expander */
+    case ANIMTYPE_FILLANIM: /* Animation Expander */