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:
authorDalai Felinto <dalai@blender.org>2021-09-28 11:33:42 +0300
committerDalai Felinto <dalai@blender.org>2021-09-28 11:44:39 +0300
commite5ff9f3615dec3ad8701e404bb4f57e758f71032 (patch)
tree8e12b87ad8560d1193bdc0988cb0fe34daba09c6 /source/blender/sequencer/intern
parenta64782b1334118d1bd98c78f665e7e0bfd232076 (diff)
Cleanup: Move VSE channels check into own util function
Differential Revision: https://developer.blender.org/D12661
Diffstat (limited to 'source/blender/sequencer/intern')
-rw-r--r--source/blender/sequencer/intern/sequencer.c12
-rw-r--r--source/blender/sequencer/intern/strip_transform.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c
index 382bd51aae1..c164e7fc2ee 100644
--- a/source/blender/sequencer/intern/sequencer.c
+++ b/source/blender/sequencer/intern/sequencer.c
@@ -636,6 +636,18 @@ void SEQ_sequence_base_dupli_recursive(const Scene *scene_src,
seq_new_fix_links_recursive(seq);
}
}
+
+bool SEQ_valid_strip_channel(Sequence *seq)
+{
+ if (seq->machine < 1) {
+ return false;
+ }
+ if (seq->machine > MAXSEQ) {
+ return false;
+ }
+ return true;
+}
+
/* r_prefix + [" + escaped_name + "] + \0 */
#define SEQ_RNAPATH_MAXSTR ((30 + 2 + (SEQ_NAME_MAXSTR * 2) + 2) + 1)
diff --git a/source/blender/sequencer/intern/strip_transform.c b/source/blender/sequencer/intern/strip_transform.c
index d5ff455c694..54ca4ef487f 100644
--- a/source/blender/sequencer/intern/strip_transform.c
+++ b/source/blender/sequencer/intern/strip_transform.c
@@ -278,7 +278,7 @@ bool SEQ_transform_seqbase_shuffle_ex(ListBase *seqbasep,
SEQ_time_update_sequence(evil_scene, test);
}
- if ((test->machine < 1) || (test->machine > MAXSEQ)) {
+ if (!SEQ_valid_strip_channel(test)) {
/* Blender 2.4x would remove the strip.
* nicer to move it to the end */