From 5dd747a54cfb8f0f822b02c8b932083f016b11c8 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Sat, 12 Mar 2022 10:33:32 +0100 Subject: Fix T96352: Gpencil crash using Normalize Thickness with Curves The stroke curve data could be NULL. --- source/blender/editors/gpencil/gpencil_edit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index afb786da8c6..2ac7ec4f25c 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -5445,9 +5445,10 @@ static int gpencil_stroke_normalize_exec(bContext *C, wmOperator *op) if (ED_gpencil_stroke_can_use(C, gps) == false) { continue; } - - bool selected = (is_curve_edit) ? gps->editcurve->flag |= GP_CURVE_SELECT : - (gps->flag & GP_STROKE_SELECT); + bool is_curve_ready = (gps->editcurve != NULL); + bool selected = (is_curve_edit && is_curve_ready) ? + gps->editcurve->flag |= GP_CURVE_SELECT : + (gps->flag & GP_STROKE_SELECT); if (!selected) { continue; } @@ -5460,7 +5461,7 @@ static int gpencil_stroke_normalize_exec(bContext *C, wmOperator *op) } /* Loop all Polyline points. */ - if (!is_curve_edit) { + if (!is_curve_edit || !is_curve_ready) { for (int i = 0; i < gps->totpoints; i++) { bGPDspoint *pt = &gps->points[i]; if (mode == GP_NORMALIZE_THICKNESS) { -- cgit v1.2.3