@@ -0,0 +2,4 @@
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+"""NOTE: this is temporary UI code to show animation layers.

@@ -0,0 +27,4 @@
+struct Main;
+struct PointerRNA;
+
+namespace blender::animrig {

@@ -0,0 +58,4 @@
+
+/* Copied from source/blender/blenkernel/intern/grease_pencil.cc. It also has a shrink_array()
+ * function, if we ever need one (we will). */
+template<typename T> static void grow_array(T **array, int *num, const int add_num)

@@ -177,0 +213,4 @@
+          }
+
+          if (strip->contains_frame(frame_time)) {
+            /* Found it! */

@@ -0,0 +206,4 @@
+  return {};
+}
+
+static float lerp(const float t, const float a, const float b)

@@ -0,0 +153,4 @@
+/** Free (or release) any data used by this animation (does not free the animation itself). */
+static void animation_free_data(ID *id)
+{
+  ((Animation *)id)->wrap().free_data();

@@ -0,0 +10,4 @@
+#pragma once
+
+#ifndef __cplusplus
+#  error This is a C++ header.

@@ -0,0 +35,4 @@
+class Output;
+
+/* Use an alias for the stable index type. */
+using output_index_t = decltype(::AnimationOutput::stable_index);

@@ -0,0 +57,4 @@
+   * After this call, the passed reference is no longer valid, as the memory
+   * will have been freed. Any strips on the layer will be freed too.
+   *
+   * \return true when the layer was found & removed, false if it wasn't found. */

@@ -0,0 +100,4 @@
+   * later. In that case, the ID will not actually receive any animation.
+   * \param animated_id The ID that should be animated by this Animation data-block.
+   */
+  bool assign_id(Output *output, ID *animated_id);

@@ -0,0 +125,4 @@
+  int64_t find_layer_index(const Layer &layer) const;
+
+ private:
+  Output &output_allocate_();

@@ -0,0 +130,4 @@
+static_assert(sizeof(Animation) == sizeof(::Animation),
+              "DNA struct and its C++ wrapper must have the same size");
+
+class Layer : public ::AnimationLayer {

@@ -0,0 +207,4 @@
+  bool is_last_frame(float frame_time) const;
+
+  /**
+   * Set the start and end frame.

@@ -0,0 +240,4 @@
+   * \return nullptr if there is none yet for this output.
+   */
+  const ChannelsForOutput *chans_for_out(const Output &out) const;
+  ChannelsForOutput *chans_for_out(const Output &out);

@@ -34,0 +34,4 @@
+/**
+ * Create an fcurve for a specific channel, pre-set-up with default flags and interpolation mode.
+ */
+FCurve *create_fcurve_for_channel(const char rna_path[], const int array_index);

@@ -0,0 +58,4 @@
+
+/* Copied from source/blender/blenkernel/intern/grease_pencil.cc. It also has a shrink_array()
+ * function, if we ever need one (we will). */
+template<typename T> static void grow_array(T **array, int *num, const int add_num)

@@ -0,0 +279,4 @@
+  return const_cast<Output *>(out);
+}
+
+const Output *Animation::output_for_id(const ID *animated_id) const

@@ -0,0 +280,4 @@
+}
+
+const Output *Animation::output_for_id(const ID *animated_id) const
+

@@ -0,0 +421,4 @@
+  adt->animation = nullptr;
+}
+
+/* ----- AnimationLayer C++ implementation ----------- */

@@ -0,0 +435,4 @@
+}
+const Strip *Layer::strip(const int64_t index) const
+{
+  return &this->strip_array[index]->wrap();

@@ -0,0 +467,4 @@
+  if (strip_index < this->strip_array_num - 1) {
+    ::AnimationStrip **start = this->strip_array + strip_index;
+    const int64_t num_to_move = this->strip_array_num - strip_index - 1;
+    memmove((void *)start, (void *)(start + 1), num_to_move * sizeof(::AnimationStrip *));

@@ -0,0 +583,4 @@
+
+void Strip::free_data()
+{
+  /* This could be a map lookup, but a `switch` will emit a compiler warning when a new strip type

@@ -0,0 +590,4 @@
+      this->as<animrig::KeyframeStrip>().free_data();
+      return;
+  }
+  BLI_assert(!"unfreeable strip type!");

@@ -0,0 +701,4 @@
+                                             const int array_index)
+{
+  FCurve *fcurve = this->fcurve_find(out, rna_path, array_index);
+  if (fcurve) {

@@ -177,0 +218,4 @@
+          }
+
+          /* See if this at least a better match for any previously-found FCurve. */
+          const float this_distance = min_ff(fabs(frame_time - strip->frame_start),

@@ -0,0 +184,4 @@
+  }
+}
+
+/* Returns whether the strip was evaluated. */

@@ -0,0 +186,4 @@
+
+/* Returns whether the strip was evaluated. */
+static EvaluationResult evaluate_strip(PointerRNA *animated_id_ptr,
+                                       Strip &strip,

@@ -0,0 +261,4 @@
+
+namespace internal {
+
+EvaluationResult evaluate_layer(PointerRNA *animated_id_ptr,

@@ -0,0 +279,4 @@
+      continue;
+    }
+
+    const auto strip_result = evaluate_strip(

@@ -0,0 +50,4 @@
+      : value(value), prop_rna(prop_rna)
+  {
+  }
+  ~AnimatedProperty() = default;

@@ -0,0 +77,4 @@
+ public:
+  operator bool() const
+  {
+    return !is_empty();

@@ -0,0 +83,4 @@
+  {
+    return result_.is_empty();
+  }
+  EvaluationResult &operator=(EvaluationResult other)

@@ -32,6 +33,17 @@ KeyframeSettings get_keyframe_settings(const bool from_userprefs)
   return settings;
 }
 
+FCurve *create_fcurve_for_channel(const char rna_path[], const int array_index)

@@ -0,0 +41,4 @@
+    const AnimationChannelsForOutput *channels_src);
+
+using anim_strip_duplicator = AnimationStrip *(*)(const AnimationStrip *strip_src);
+using anim_strip_freeer = void (*)(AnimationStrip *strip);

@@ -0,0 +97,4 @@
+
+static AnimationOutput *anim_output_duplicate(const AnimationOutput *output_src)
+{
+  AnimationOutput *output_dup = static_cast<AnimationOutput *>(MEM_dupallocN(output_src));

@@ -0,0 +103,4 @@
+
+static AnimationStrip *anim_strip_duplicate(const AnimationStrip *strip_src)
+{
+  anim_strip_duplicator duplicator = get_strip_duplicator(eAnimationStrip_type(strip_src->type));

@@ -1643,0 +1675,4 @@
+                                                                Animation *dna_animation)
+{
+  BLI_assert(id != nullptr);
+  BLI_assert(operation_from != nullptr);

@@ -1211,0 +1260,4 @@
+typedef struct Animation {
+  ID id;
+
+  struct AnimationLayer **layer_array;   /* Array of 'layer_array_num' layers. */

@@ -1211,0 +1290,4 @@
+
+  /**
+   * There is always at least one strip.
+   * If there is only one, it can be infinite. This is the default for new layers. */

@@ -1211,0 +1345,4 @@
+
+typedef struct AnimationStrip {
+  /** eAnimationStrip_type */
+  uint8_t type;

@@ -1211,0 +1350,4 @@
+
+  float frame_start;
+  float frame_end;
+  float frame_offset;

@@ -1211,0 +1358,4 @@
+#endif
+} AnimationStrip;
+
+typedef enum eAnimationStrip_type {

@@ -0,0 +35,4 @@
+     "OFFSET",
+     0,
+     "Offset",
+     "Animation channels in this layer are added, as sequential operations, to the output of "

@@ -0,0 +192,4 @@
+  animrig::Animation &anim = dna_animation->wrap();
+  animrig::Layer &layer = dna_layer->wrap();
+  if (!anim.layer_remove(layer)) {
+    BKE_report(reports, RPT_ERROR, "this layer does not belong to this animation");

@@ -0,0 +70,4 @@
+            col.prop(layer, "influence")
+            col.prop(layer, "mix_mode")
+
+            # for strip_idx, strip in enumerate(layer.strips):

@@ -0,0 +354,4 @@
+   * Should only be called when there is no `ChannelBag` for this output yet.
+   */
+  ChannelBag &channelbag_for_output_add(const Output &out);
+  /**

@@ -177,0 +226,4 @@
+            found_on_other_strip = fcu;
+            found_at_time_distance = this_distance;
+          }
+        } break;

@@ -160,1 +581,4 @@
 
+bool Strip::contains_frame(const float frame_time) const
+{
+  return frame_start <= frame_time && frame_time <= frame_end;

@@ -0,0 +72,4 @@
+  ~EvaluationResult() = default;
+
+ public:
+  operator bool() const

@@ -0,0 +120,4 @@
+                                                         const int array_index,
+                                                         const float eval_time)
+  {
+    const std::optional<float> eval_value = evaluate_single_property(

@@ -71,0 +112,4 @@
+  /** Assign this animation to the ID.
+   *
+   * \param binding The binding this ID should be animated by, may be nullptr if it is to be
+   * assigned later. In that case, the ID will not actually receive any animation. \param

@@ -175,0 +273,4 @@
+   * After this call, the passed reference is no longer valid, as the memory
+   * will have been freed.
+   *
+   * \return true when the strip was found & removed, false if it wasn't found. */

@@ -76,0 +327,4 @@
+    }
+  }
+
+  /* Try the binding name from the AnimData, if it is set,*/

@@ -26,6 +27,9 @@
 #include "RNA_access.hh"
 #include "RNA_path.hh"
 
+#include <algorithm>

@@ -0,0 +113,4 @@
+/**
+ * Evaluate the animation data on the given layer, for the given binding. This
+ * just returns the evaluation result, without taking any other layers,
+ * blending, influence, etc. into account. */

@@ -224,0 +250,4 @@
+  BLI_assert_msg(adt, "ID.animation_data is unexpectedly empty");
+  if (!adt) {
+    WM_reportf(RPT_ERROR,
+               "Data-block '%s' does not have any animation data, how did you set this property?",

@@ -224,0 +263,4 @@
+
+  blender::animrig::Animation *anim = blender::animrig::get_animation(animated_id);
+  if (!anim) {
+    /* No animation to verify the stable index is valid. Just set it, it'll be ignored anyway. */

@@ -0,0 +213,4 @@
+  animrig::Binding &binding_to_find = rna_data_binding(ptr);
+
+  Span<animrig::Binding *> bindings = anim.bindings();
+  for (int i = 0; i < bindings.size(); ++i) {

@@ -0,0 +318,4 @@
+
+  for (animrig::Layer *layer : anim.layers()) {
+    Span<animrig::Strip *> strips = layer->strips();
+    for (int i = 0; i < strips.size(); ++i) {

@@ -0,0 +357,4 @@
+                                                     const float time)
+{
+  if (dna_binding == nullptr) {
+    BKE_report(reports, RPT_ERROR, "binding cannot be None");

@@ -0,0 +534,4 @@
+  parm = RNA_def_enum(func,
+                      "type",
+                      rna_enum_strip_type_items,
+                      (int)animrig::Strip::Type::Keyframe,

@@ -7221,0 +7222,4 @@
+  prop = RNA_def_property(srna, "use_animation_baklava", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, nullptr, "use_animation_baklava", 1);
+  RNA_def_property_ui_text(
+      prop, "Animation: Project Baklava", "Enable the new multi-id, layered animation system");

@@ -235,2 +399,4 @@
   const FCurve *fcurve(int64_t index) const;
   FCurve *fcurve(int64_t index);
+
+  const FCurve *fcurve_find(const StringRefNull rna_path, const int array_index) const;

@@ -0,0 +13,4 @@
+
+class PropIdentifier {
+ public:
+  StringRefNull rna_path;

@@ -71,0 +91,4 @@
+   *
+   * \see Animation::binding_name_propagate
+   */
+  void binding_name_set(Binding &binding, StringRefNull new_name);

@@ -71,0 +116,4 @@
+   * assigned later. In that case, the ID will not actually receive any animation.
+   * \param animated_id The ID that should be animated by this Animation data-block.
+   */
+  bool assign_id(Binding *binding, ID &animated_id);

@@ -71,0 +129,4 @@
+   * - `animated_id.adt->binding_name`,
+   * - `animated_id.name`.
+   *
+   * Note that this different from #binding_for_id, which does not use the

@@ -216,0 +371,4 @@
+   * Find an FCurve for this binding + RNA path + array index combination.
+   *
+   * If it cannot be found, a new one is created.
+   */

@@ -216,0 +373,4 @@
+   * If it cannot be found, a new one is created.
+   */
+  FCurve &fcurve_find_or_create(const Binding &binding, StringRefNull rna_path, int array_index);
+

@@ -36,0 +41,4 @@
+}
+static animrig::Strip &animationstrip_alloc_infinite(const Strip::Type type)
+{
+  AnimationStrip *strip;

@@ -36,0 +57,4 @@
+  return strip->wrap();
+}
+
+/* Copied from source/blender/blenkernel/intern/grease_pencil.cc. It also has a shrink_array()

@@ -36,0 +68,4 @@
+      MEM_cnew_array<T *>(new_array_num, "animrig::animation/grow_array"));
+
+  blender::uninitialized_relocate_n(*array, *num, new_array);
+  if (*array != nullptr) {

@@ -76,0 +298,4 @@
+{
+  Binding &binding = MEM_new<AnimationBinding>(__func__)->wrap();
+  this->last_binding_handle++;
+  BLI_assert_msg(this->last_binding_handle > 0, "Animation Binding handle 32-bit overflow");

@@ -93,0 +387,4 @@
+    STRNCPY_UTF8(adt->binding_name, binding->name);
+  }
+  else {
+    adt->binding_handle = 0;

@@ -93,0 +403,4 @@
+void Animation::unassign_id(ID &animated_id)
+{
+  AnimData *adt = BKE_animdata_from_id(&animated_id);
+  BLI_assert_msg(adt->animation == this, "ID is not assigned to this Animation");

@@ -93,0 +409,4 @@
+   * If Blender would be bug-free, and we could assume that `Animation::binding_name_propagate()`
+   * would always be called when appropriate, this code could be removed. */
+  const Binding *binding = this->binding_for_handle(adt->binding_handle);
+  if (binding) {

@@ -135,0 +531,4 @@
+
+  Binding *binding = anim.find_suitable_binding_for(animated_id);
+  return anim.assign_id(binding, animated_id);
+}

@@ -0,0 +55,4 @@
+
+  void TearDown() override
+  {
+    BKE_id_free(bmain, &cube->id);

@@ -280,1 +282,4 @@
 
+  if (adt->animation) {
+    blender::animrig::Animation &anim = adt->animation->wrap();
+    return anim.binding_for_id(*id) != nullptr;

@@ -224,0 +255,4 @@
+    return;
+  }
+
+  if (new_binding_handle == 0) {

@@ -224,0 +257,4 @@
+
+  if (new_binding_handle == 0) {
+    /* No need to check with the Animation, as 'no binding' is always valid. */
+    adt->binding_handle = 0;

@@ -1484,0 +1549,4 @@
+  RNA_def_property_ui_text(prop, "Animation", "Active Animation for this data-block");
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN, "rna_AnimData_dependency_update");
+
+  prop = RNA_def_property(srna, "animation_binding_handle", PROP_INT, PROP_NONE);

@@ -1484,0 +1554,4 @@
+  RNA_def_property_int_funcs(prop, nullptr, "rna_AnimData_animation_binding_handle_set", nullptr);
+  RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN, "rna_AnimData_dependency_update");
+
+  prop = RNA_def_property(srna, "animation_binding_name", PROP_STRING, PROP_NONE);

@@ -0,0 +132,4 @@
+  if (animated_id == nullptr) {
+    BKE_report(reports,
+               RPT_ERROR,
+               "An binding without animated ID cannot be created at the moment; if you need it, "

@@ -0,0 +167,4 @@
+
+  if (anim.layers().size() >= 1) {
+    /* Not allowed to have more than one layer, for now. This limitation is in
+     * place until working with multiple animated IDs is fleshed binding better. */

@@ -0,0 +265,4 @@
+
+  if (layer.strips().size() >= 1) {
+    /* Not allowed to have more than one strip, for now. This limitation is in
+     * place until working with layers is fleshed binding better. */

@@ -0,0 +285,4 @@
+  animrig::Layer &layer = dna_layer->wrap();
+  animrig::Strip &strip = dna_strip->wrap();
+  if (!layer.strip_remove(strip)) {
+    BKE_report(reports, RPT_ERROR, "this strip does not belong to this layer");

@@ -0,0 +374,4 @@
+}
+
+static AnimationChannelBag *rna_KeyframeAnimationStrip_channels(
+    KeyframeAnimationStrip *self, const animrig::binding_handle_t binding_handle)

@@ -0,0 +378,4 @@
+{
+  animrig::KeyframeStrip &key_strip = self->wrap();
+  return key_strip.channelbag_for_binding(binding_handle);
+}

@@ -0,0 +406,4 @@
+      func, "binding", "AnimationBinding", "", "Newly created animation binding");
+  RNA_def_function_return(func, parm);
+}
+

@@ -0,0 +445,4 @@
+static void rna_def_animation(BlenderRNA *brna)
+{
+  StructRNA *srna;
+  PropertyRNA *prop;

@@ -0,0 +472,4 @@
+
+  prop = RNA_def_property(srna, "layers", PROP_COLLECTION, PROP_NONE);
+  RNA_def_property_struct_type(prop, "AnimationLayer");
+  RNA_def_property_collection_funcs(prop,

@@ -0,0 +474,4 @@
+  RNA_def_property_struct_type(prop, "AnimationLayer");
+  RNA_def_property_collection_funcs(prop,
+                                    "rna_iterator_animation_layers_begin",
+                                    "rna_iterator_array_next",

@@ -0,0 +479,4 @@
+                                    "rna_iterator_array_dereference_get",
+                                    "rna_iterator_animation_layers_length",
+                                    nullptr,
+                                    nullptr,

@@ -0,0 +497,4 @@
+                         "Reference to a data-block that will be animated by this Animation");
+
+  prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+  RNA_def_struct_name_property(srna, prop);

@@ -0,0 +535,4 @@
+  func = RNA_def_function(srna, "remove", "rna_AnimationStrips_remove");
+  RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
+  RNA_def_function_ui_description(func, "Remove the strip from the animation layer");
+  parm = RNA_def_pointer(

@@ -0,0 +543,4 @@
+static void rna_def_animation_layer(BlenderRNA *brna)
+{
+  StructRNA *srna;
+  PropertyRNA *prop;

@@ -0,0 +584,4 @@
+                                    nullptr);
+  RNA_def_property_ui_text(prop, "Strips", "The list of strips that are on this animation layer");
+
+  rna_def_animationlayer_strips(brna, prop);

@@ -0,0 +659,4 @@
+        "array_index",
+        -1,
+        -INT_MAX,
+        INT_MAX,

@@ -186,3 +319,3 @@
  * be animated by.
  *
- * This is called an 'binding' because it acts like an binding socket of the
+ * This is called an 'binding' because it acts like a binding socket of the

@@ -241,0 +445,4 @@
+ * - By fallback string.
+ * - By the ID's name (matching agains the binding name).
+ * - If the above do not find a suitable binding, the animated ID will not
+ *   receive any animation and the calller is responsible for creating an binding