diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-01-25 09:43:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-01-25 09:43:00 +0300 |
commit | bf329d37dae35103d1f68b1c599d1391864f3f3e (patch) | |
tree | f96246ccedd124e0c9ea3ef3a734b2e4b6013018 /source | |
parent | 7a0281914ec94e6a495cc354844e91d88b8b18ae (diff) | |
parent | 7f9ed0178ade69cdd17c18ea3ab41bdd3cf88ab6 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_interpolate.c | 8 | ||||
-rw-r--r-- | source/blender/sequencer/intern/effects.c | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 55456cf717e..972b2ed7351 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -555,9 +555,7 @@ static int gpencil_interpolate_invoke(bContext *C, wmOperator *op, const wmEvent } if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) { - BKE_report(op->reports, - RPT_ERROR, - "Cannot interpolate in curve edit mode"); + BKE_report(op->reports, RPT_ERROR, "Cannot interpolate in curve edit mode"); return OPERATOR_CANCELLED; } @@ -986,9 +984,7 @@ static int gpencil_interpolate_seq_exec(bContext *C, wmOperator *op) } if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) { - BKE_report(op->reports, - RPT_ERROR, - "Cannot interpolate in curve edit mode"); + BKE_report(op->reports, RPT_ERROR, "Cannot interpolate in curve edit mode"); return OPERATOR_CANCELLED; } diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c index 1631a4534d6..65c768076c5 100644 --- a/source/blender/sequencer/intern/effects.c +++ b/source/blender/sequencer/intern/effects.c @@ -3150,10 +3150,12 @@ static void store_icu_yrange_speed(Sequence *seq, short UNUSED(adrcode), float * } } -/* Generator strips with zero inputs have their length set to 1 pernamently. In some cases it is +/** + * Generator strips with zero inputs have their length set to 1 permanently. In some cases it is * useful to use speed effect on these strips because they can be animated. This can be done by - * using their length as is on timeline as content length. See T82698. */ -int seq_effect_speed_get_strip_content_length(const Sequence *seq) + * using their length as is on timeline as content length. See T82698. + */ +static int seq_effect_speed_get_strip_content_length(const Sequence *seq) { if (SEQ_effect_get_num_inputs(seq->type) == 0) { return seq->enddisp - seq->startdisp; |