Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-11-12 10:35:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-11-12 10:35:13 +0300
commit02333544d1675626bf7974b1f2c53c8b312ffa6f (patch)
treece5a2b9826f5f15c7a39cf4a23a70ed4f051265a
parent1e1c87000150d3eceeda77d64c41b2856da5c2b2 (diff)
parentd612d926308a1f73c9656d049f56fd98b74428a5 (diff)
Merge branch 'blender-v3.0-release'
-rw-r--r--source/blender/blenkernel/intern/scene.c2
-rw-r--r--source/blender/blenloader/BLO_readfile.h2
-rw-r--r--source/blender/windowmanager/intern/wm_files.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 04106e6f42a..a0bd3abbc1a 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1071,7 +1071,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);
}