blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Campbell Barton 2021-01-25 17:43:00 +11:00
parent 7a0281914e 7f9ed0178a
commit bf329d37da
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/gpencil/gpencil_interpolate.c
View File

@ -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;
}

8
source/blender/sequencer/intern/effects.c
View File

@ -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;