diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-10-17 08:01:12 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-10-17 08:01:12 +0300 |
commit | 2c14a950a718b2a82d6f9da29bad038a2c91ec74 (patch) | |
tree | 9a1df22b067d9e3206ff57090ba9d7fab0cccc7e /source/blender/sequencer | |
parent | e2c5439cb4eb423373750dae0dec8c5db3912b88 (diff) |
Fix T81594: Unable to reassign effect inputs
This was caused by canceling operator if strip has more than 0 inputs.
Logic should be reversed - cancel only if strip has 0 inputs.
BKE_sequencer_render_loop_check() arguments had to be sanitized because
seq_effect_find_selected() can set seq1,2,3 to NULL
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D9197
Diffstat (limited to 'source/blender/sequencer')
-rw-r--r-- | source/blender/sequencer/intern/sequencer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index cb62ffe500b..2e38c478905 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -6085,6 +6085,10 @@ bool BKE_sequencer_check_scene_recursion(Scene *scene, ReportList *reports) /* Check if "seq_main" (indirectly) uses strip "seq". */ bool BKE_sequencer_render_loop_check(Sequence *seq_main, Sequence *seq) { + if (seq_main == NULL || seq == NULL) { + return false; + } + if (seq_main == seq) { return true; } |