Merge branch 'blender-v4.1-release'

This commit is contained in:
Richard Antalik
2024-03-02 18:34:38 +01:00

View File

@@ -1112,9 +1112,14 @@ int seq_effect_find_selected(Scene *scene,
seq2 = SEQ_select_active_get(scene);
}
if (SEQ_effect_get_num_inputs(type) == 0) {
*r_selseq1 = *r_selseq2 = *r_selseq3 = nullptr;
return 1;
}
LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
if (seq->flag & SELECT) {
if (seq->type == SEQ_TYPE_SOUND_RAM && SEQ_effect_get_num_inputs(type) != 0) {
if (seq->type == SEQ_TYPE_SOUND_RAM) {
*r_error_str = N_("Cannot apply effects to audio sequence strips");
return 0;
}
@@ -1145,9 +1150,6 @@ int seq_effect_find_selected(Scene *scene,
}
switch (SEQ_effect_get_num_inputs(type)) {
case 0:
*r_selseq1 = *r_selseq2 = *r_selseq3 = nullptr;
return 1; /* Success. */
case 1:
if (seq2 == nullptr) {
*r_error_str = N_("At least one selected sequence strip is needed");