From f24992d2ec76bae600879ee6222ffbcc98de3fe8 Mon Sep 17 00:00:00 2001 From: Falk David Date: Thu, 21 Jan 2021 21:58:39 +0100 Subject: GPencil: Deactivate interpolation of gpencil curves To avoid unexpected behavior and desync issues with stroke and curve data, the interpolation operators are deactivated in curve edit mode. --- source/blender/editors/gpencil/gpencil_interpolate.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source/blender/editors/gpencil/gpencil_interpolate.c') diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 1c967110198..b51604f3bfc 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; -- cgit v1.2.3