blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Campbell Barton 2021-11-12 18:35:13 +11:00
parent 1e1c870001 d612d92630
commit 02333544d1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/scene.c
View File

@ -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);

2
source/blender/blenloader/BLO_readfile.h
View File

@ -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

4
source/blender/windowmanager/intern/wm_files.c
View File

@ -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);
}