Rename variables

Rename variables

@@ -1466,2 +1471,3 @@
           if (SEQ_time_right_handle_frame_get(scene, seq) == split_frame &&
-              seq->machine == split_channel) {
+              seq->machine == split_channel)
+          {

@@ -10,183 +10,377 @@
 
 #include <cstring>
 
+#include "BKE_lib_query.h"

@@ -23,0 +32,4 @@
+#include "BKE_appdir.h"
+#include "BKE_blender_copybuffer.h"
+#include "BKE_blendfile.h"
+#include "BKE_context.h"

@@ -52,3 +66,1 @@
-void seq_clipboard_pointers_free(ListBase *seqbase);
-
-void SEQ_clipboard_free()
+static void null_scene_strips(Sequence *seq)

@@ -192,0 +293,4 @@
+    }
+  }
+
+  int stripts_to_paste = 0;

@@ -192,0 +305,4 @@
+  }
+
+  Main *bmain = CTX_data_main(C);
+  std::pair<Main *, Main *> pair_main = std::pair(bmain, temp_bmain);

@@ -164,0 +206,4 @@
+/* Paste Operator Helper functions
+ */
+
+struct Main_pair {

@@ -57,3 +77,2 @@
 
-  LISTBASE_FOREACH_MUTABLE (Sequence *, seq, &seqbase_clipboard) {
-    seq_free_sequence_recurse(nullptr, seq, false);
+static void sequencer_copy_animation_listbase(Scene *scene,

@@ -76,0 +103,4 @@
+static void sequencer_copy_animation(Scene *scene_src,
+                                     ListBase *copied_fcurves,
+                                     ListBase *copied_drivers,
+                                     Sequence *seq)

@@ -129,0 +141,4 @@
+
+  /* Save current frame and active strip. */
+  scene_dst->r.cfra = scene_src->r.cfra;
+  Sequence *prev_active_seq = SEQ_select_active_get(scene_src);

@@ -129,0 +143,4 @@
+  scene_dst->r.cfra = scene_src->r.cfra;
+  Sequence *prev_active_seq = SEQ_select_active_get(scene_src);
+  if (prev_active_seq) {
+    LISTBASE_FOREACH (Sequence *, seq, &scene_dst->ed->seqbase) {

@@ -134,1 +153,3 @@
-    ID_PT = static_cast<ID *>(id_restore);
+  ListBase fcurves_dst = {nullptr, nullptr};
+  ListBase drivers_dst = {nullptr, nullptr};
+  LISTBASE_FOREACH (Sequence *, seq, &scene_dst->ed->seqbase) {

@@ -135,0 +160,4 @@
+    /* Copy animation curves from seq (if any). */
+    sequencer_copy_animation(scene_src, &fcurves_dst, &drivers_dst, seq);
+  }
+  if (BLI_listbase_count(&fcurves_dst) != 0 || BLI_listbase_count(&drivers_dst) != 0) {

@@ -135,0 +161,4 @@
+    sequencer_copy_animation(scene_src, &fcurves_dst, &drivers_dst, seq);
+  }
+  if (BLI_listbase_count(&fcurves_dst) != 0 || BLI_listbase_count(&drivers_dst) != 0) {
+    bAction *act = ED_id_action_ensure(bmain_src, &scene_dst->id);

@@ -136,0 +173,4 @@
+  /* Create the copy/paste temp file */
+  bool retval = BKE_copybuffer_copy_end(bmain_src, filepath, reports);
+  /* Cleanup the dummy scene file */
+  BKE_id_delete(bmain_src, scene_dst);

@@ -136,0 +174,4 @@
+  bool retval = BKE_copybuffer_copy_end(bmain_src, filepath, reports);
+  /* Cleanup the dummy scene file */
+  BKE_id_delete(bmain_src, scene_dst);
+

@@ -164,0 +206,4 @@
+/* Paste Operator Helper functions
+ */
+
+struct MainPair {

@@ -168,0 +220,4 @@
+  MainPair *pair_main = static_cast<MainPair *>(cb_data->user_data);
+  Main *bmain = pair_main->first;
+  Main *temp_bmain = pair_main->second;
+  ID *id_p = *cb_data->id_pointer;

@@ -168,0 +222,4 @@
+  Main *temp_bmain = pair_main->second;
+  ID *id_p = *cb_data->id_pointer;
+
+  if (id_p && cb_data->cb_flag & IDWALK_CB_USER) {

@@ -168,0 +223,4 @@
+  ID *id_p = *cb_data->id_pointer;
+
+  if (id_p && cb_data->cb_flag & IDWALK_CB_USER) {
+    ID_Type type = GS((id_p)->name);

@@ -168,0 +230,4 @@
+    }
+
+    ListBase *lb = which_libbase(bmain, type);
+    ID *id_local = static_cast<ID *>(BLI_findstring(lb, (id_p)->name + 2, offsetof(ID, name) + 2));

@@ -168,0 +236,4 @@
+      /* A data block with the same name already exists.
+       * Don't copy over any new datablocks, reuse the data block that exists.
+       */
+      id_us_min(id_local);

@@ -168,0 +237,4 @@
+       * Don't copy over any new datablocks, reuse the data block that exists.
+       */
+      id_us_min(id_local);
+      BKE_libblock_remap(temp_bmain, id_p, id_local, ID_REMAP_SKIP_INDIRECT_USAGE);

@@ -168,0 +241,4 @@
+    }
+    else {
+      /* No data block of the same name already exists, transfer it over from temp_bmain. */
+      id_us_min(id_p);

@@ -186,2 +274,4 @@
+    BLI_addtail(&scene->adt->drivers, BKE_fcurve_copy(fcu));
   }
 }
+int SEQ_clipboard_paste_exec(bContext *C, wmOperator *op)

@@ -192,0 +298,4 @@
+  }
+
+  int num_strips_to_paste = 0;
+  if (paste_scene && paste_scene->ed) {

@@ -57,0 +71,4 @@
+    }
+  }
+  else if (seq->type == SEQ_TYPE_SCENE) {
+    seq->scene = nullptr;

@@ -60,0 +78,4 @@
+static void sequencer_copy_animation_listbase(Scene *scene_src,
+                                              Sequence *seq_dst,
+                                              ListBase *clipboard_dst,
+                                              ListBase *fcurve_base)

@@ -67,3 +94,2 @@
 
-  LISTBASE_FOREACH_MUTABLE (FCurve *, fcu, &drivers_clipboard) {
-    BKE_fcurve_free(fcu);
+  GSET_FOREACH_BEGIN (FCurve *, fcu, fcurves) {

@@ -129,0 +142,4 @@
+  scene_dst->r.cfra = scene_src->r.cfra;
+  Sequence *active_seq_src = SEQ_select_active_get(scene_src);
+  if (active_seq_src) {
+    LISTBASE_FOREACH (Sequence *, seq_dst, &scene_dst->ed->seqbase) {

@@ -135,0 +152,4 @@
+  ListBase fcurves_dst = {nullptr, nullptr};
+  ListBase drivers_dst = {nullptr, nullptr};
+  LISTBASE_FOREACH (Sequence *, seq_dst, &scene_dst->ed->seqbase) {
+    /* Null and scene pointers in scene strips. We don't want to copy whole scenes.

@@ -176,0 +250,4 @@
+      /* A data block with the same name already exists.
+       * Don't copy over any new datablocks, reuse the data block that exists.
+       */
+      if (id_local->lib != nullptr && id->lib != nullptr) {

@@ -176,0 +251,4 @@
+       * Don't copy over any new datablocks, reuse the data block that exists.
+       */
+      if (id_local->lib != nullptr && id->lib != nullptr) {
+        /* Check if they are using the same the same filepath. */

@@ -192,0 +320,4 @@
+  }
+
+  if (!paste_scene || !paste_scene->ed) {
+    BKE_report(op->reports, RPT_INFO, "No clipboard scene to paste VSE data from");

@@ -76,12 +76,27 @@ static void copybuffer_append(BlendfileLinkAppendContext *lapp_context,
   /* Tag existing IDs in given `bmain_dst` as already existing. */
   BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, true);
 
+  std::string bmain_file_path = bmain->filepath;

@@ -58,2 +71,2 @@
-  LISTBASE_FOREACH_MUTABLE (Sequence *, seq, &seqbase_clipboard) {
-    seq_free_sequence_recurse(nullptr, seq, false);
+  /* We don't care about embedded, loopback, or internal IDs. */
+  if (cb_data->cb_flag & (IDWALK_CB_EMBEDDED | IDWALK_CB_LOOPBACK | IDWALK_CB_INTERNAL)) {

@@ -101,0 +78,4 @@
+    /* Nullify everything that is not:
+     * Sound, Movieclip, Image, Text, Vfont, Action, or Collection IDs.
+     */
+    if (!ELEM(id_type, ID_SO, ID_MC, ID_IM, ID_TXT, ID_VF, ID_AC, ID_GR)) {

@@ -101,0 +80,4 @@
+     */
+    if (!ELEM(id_type, ID_SO, ID_MC, ID_IM, ID_TXT, ID_VF, ID_AC, ID_GR)) {
+      BKE_id_remapper_add(id_remapper, id, nullptr);
+      return IDWALK_RET_NOP;

@@ -105,0 +136,4 @@
+                                            ReportList *reports)
+
+{
+  Scene *scene_dst = BKE_scene_add(bmain_src, "copybuffer_vse_scene");

@@ -105,0 +237,4 @@
+  std::vector<ID *> ids_to_copy;
+};
+
+enum {

@@ -105,0 +243,4 @@
+  ID_REMAP,
+};
+
+static int should_copy_id(ID *id_dst, ID *id_src, Main *bmain_dst)

@@ -105,0 +290,4 @@
+
+  /* We don't care about embedded, loopback, or internal IDs. */
+  if (cb_data->cb_flag & (IDWALK_CB_EMBEDDED | IDWALK_CB_LOOPBACK | IDWALK_CB_INTERNAL)) {
+    return IDWALK_RET_NOP;

@@ -105,0 +299,4 @@
+      /* Don't copy in actions here as we already handle these in "sequencer_paste_animation".
+       * We don't copy Collections (ID_GR) here either as we don't care about scene collections.
+       */
+      return IDWALK_RET_NOP;

@@ -117,0 +305,4 @@
+    ID *id_dst = nullptr;
+    int copy_method = -1;
+
+    ListBase *lb = which_libbase(bmain_dst, id_src_type);

@@ -117,0 +307,4 @@
+
+    ListBase *lb = which_libbase(bmain_dst, id_src_type);
+    LISTBASE_FOREACH (ID *, id_iter, lb) {
+      if (STREQ(id_src->name, id_iter->name)) {

@@ -152,0 +328,4 @@
+        BKE_id_remapper_add(paste_data->id_remapper, id_src, id_dst);
+        break;
+      case ID_LIB_COPY:
+        paste_data->ids_to_copy.push_back(&id_src->lib->id);

@@ -192,0 +411,4 @@
+                              IDWALK_RECURSE);
+
+  /* Copy over all new ID data, save remapping for after we have moved over all the strips into
+   * bmain.

@@ -192,0 +480,4 @@
+    }
+  }
+
+  BKE_libblock_remap_multiple(bmain_dst, paste_data.id_remapper, 0);

@@ -183,0 +244,4 @@
+  }
+
+  Main *bmain = CTX_data_main(C);
+  Scene *scene = CTX_data_scene(C);

@@ -192,0 +329,4 @@
+    active_seq_name.assign(prev_active_seq->name);
+  }
+
+  /* Make sure we have all data IDs we need in bmain_dst. Remap the IDs if we already have them. */

@@ -192,0 +336,4 @@
+  BKE_main_merge(bmain_dst, &bmain_src, merge_reports);
+
+  /* Paste animation.
+   * NOTE: Only fcurves are copied. Drivers and NLA action strips are not copied.

@@ -192,0 +352,4 @@
+      scene_src, scene_dst, &nseqbase, &scene_src->ed->seqbase, 0, 0);
+
+  /* BKE_main_merge will copy the scene_src and its action into bmain_dst. Remove them as
+   * we merge the data from these these manually.

@@ -0,0 +230,4 @@
+  }
+
+  /* We are all done! */
+  BKE_report(op->reports, RPT_INFO, "Copied the selected VSE strips to internal clipboard");