diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
| commit | 5f621a12c6d14d6ec0439992bc0c2590a2bd4760 (patch) | |
| tree | 7143836d4095c1260f4afee06132ffd72ccabcaa /source/blender/editors/space_sequencer | |
| parent | ca606bf55165881896467f6a5c09e5870c847fbb (diff) | |
| parent | 701a9d39175e0d3e5e2f776821f1251b8a7a5f78 (diff) | |
Merge branch 'blender-v2.90-release'
Conflicts:
source/blender/editors/gpencil/gpencil_primitive.c
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 5c60ece747a..6a63578a363 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2151,7 +2151,7 @@ static int sequencer_reassign_inputs_exec(bContext *C, wmOperator *op) if (BKE_sequencer_render_loop_check(seq1, last_seq) || BKE_sequencer_render_loop_check(seq2, last_seq) || BKE_sequencer_render_loop_check(seq3, last_seq)) { - BKE_report(op->reports, RPT_ERROR, "Cannot reassign inputs: recursion detected."); + BKE_report(op->reports, RPT_ERROR, "Cannot reassign inputs: recursion detected"); return OPERATOR_CANCELLED; } |