[Bf-blender-cvs] [d612d926308] blender-v3.0-release: Cleanup: use term sequence_strip instead of vse_strip

Campbell Barton noreply at git.blender.org
Fri Nov 12 08:34:56 CET 2021


Commit: d612d926308a1f73c9656d049f56fd98b74428a5
Author: Campbell Barton
Date:   Fri Nov 12 17:34:54 2021 +1100
Branches: blender-v3.0-release
https://developer.blender.org/rBd612d926308a1f73c9656d049f56fd98b74428a5

Cleanup: use term sequence_strip instead of vse_strip

===================================================================

M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenloader/BLO_readfile.h
M	source/blender/windowmanager/intern/wm_files.c

===================================================================

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index d7fc2005ab2..0aeee11ed17 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -999,7 +999,7 @@ static void link_recurs_seq(BlendDataReader *reader, ListBase *lb)
     /* Sanity check. */
     if (!SEQ_valid_strip_channel(seq)) {
       BLI_freelinkN(lb, seq);
-      BLO_read_data_reports(reader)->count.vse_strips_skipped++;
+      BLO_read_data_reports(reader)->count.sequence_strips_skipped++;
     }
     else if (seq->seqbase.first) {
       link_recurs_seq(reader, &seq->seqbase);
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 5a919ae3605..22182edd070 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -124,7 +124,7 @@ typedef struct BlendFileReadReport {
     /* Number of proxies that failed to convert to library overrides. */
     int proxies_to_lib_overrides_failures;
     /* Number of sequencer strips that were not read because were in non-supported channels. */
-    int vse_strips_skipped;
+    int sequence_strips_skipped;
   } count;
 
   /* Number of libraries which had overrides that needed to be resynced, and a single linked list
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 0074ecc392d..b79a5176d4f 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -887,11 +887,11 @@ static void file_read_reports_finalize(BlendFileReadReport *bf_reports)
                 bf_reports->count.linked_proxies);
   }
 
-  if (bf_reports->count.vse_strips_skipped != 0) {
+  if (bf_reports->count.sequence_strips_skipped != 0) {
     BKE_reportf(bf_reports->reports,
                 RPT_ERROR,
                 "%d sequence strips were not read because they were in a channel larger than %d",
-                bf_reports->count.vse_strips_skipped,
+                bf_reports->count.sequence_strips_skipped,
                 MAXSEQ);
   }



More information about the Bf-blender-cvs mailing list