diff options
author | Falk David <falkdavid@gmx.de> | 2021-01-21 23:59:56 +0300 |
---|---|---|
committer | Falk David <falkdavid@gmx.de> | 2021-01-21 23:59:56 +0300 |
commit | 41982af6a0fc8e11cf004a356f97222d7eb72c02 (patch) | |
tree | b2516ecfb2b8be83abd4e4271dd6c8d4f8c15916 /source/blender/editors/gpencil | |
parent | b4b02eb4ff772f1df6f37c5910695e2e8168d078 (diff) | |
parent | f24992d2ec76bae600879ee6222ffbcc98de3fe8 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_interpolate.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index fd0d5656448..55456cf717e 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -554,6 +554,13 @@ static int gpencil_interpolate_invoke(bContext *C, wmOperator *op, const wmEvent return OPERATOR_CANCELLED; } + if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) { + BKE_report(op->reports, + RPT_ERROR, + "Cannot interpolate in curve edit mode"); + return OPERATOR_CANCELLED; + } + /* need editable strokes */ if (!gpencil_interpolate_check_todo(C, gpd)) { BKE_report(op->reports, RPT_ERROR, "Interpolation requires some editable strokes"); @@ -978,6 +985,13 @@ static int gpencil_interpolate_seq_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } + if (GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) { + BKE_report(op->reports, + RPT_ERROR, + "Cannot interpolate in curve edit mode"); + return OPERATOR_CANCELLED; + } + /* loop all layer to check if need interpolation */ LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) { bGPDframe *prevFrame, *nextFrame; |