[Bf-blender-cvs] [7f9ed0178ad] blender-v2.92-release: Cleanup: compiler warning, clang-format, spelling
Campbell Barton
noreply at git.blender.org
Mon Jan 25 07:41:14 CET 2021
Commit: 7f9ed0178ade69cdd17c18ea3ab41bdd3cf88ab6
Author: Campbell Barton
Date: Mon Jan 25 17:40:40 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rB7f9ed0178ade69cdd17c18ea3ab41bdd3cf88ab6
Cleanup: compiler warning, clang-format, spelling
===================================================================
M source/blender/editors/gpencil/gpencil_interpolate.c
M source/blender/sequencer/intern/effects.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c
index b51604f3bfc..c666fcb67b7 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;
More information about the Bf-blender-cvs
mailing list