From 0cf46631e11a819aceece60e3b23491d22e9d077 Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Tue, 3 Nov 2020 16:38:43 +0100 Subject: Fix T82356: Gpencil merge freezes Blender The `gps_next` variable had a typo error and was wrongly used as `gps->next` --- source/blender/editors/gpencil/gpencil_merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/gpencil') diff --git a/source/blender/editors/gpencil/gpencil_merge.c b/source/blender/editors/gpencil/gpencil_merge.c index ca93e8de844..3e63d644760 100644 --- a/source/blender/editors/gpencil/gpencil_merge.c +++ b/source/blender/editors/gpencil/gpencil_merge.c @@ -413,7 +413,7 @@ static int gpencil_analyze_strokes(tGPencilPointCache *src_array, BLI_ghash_free(strokes, NULL, NULL); /* add the stroke to array */ - if (gps->next != NULL) { + if (gps_next != NULL) { BLI_ghash_insert(all_strokes, gps_next, gps_next); last = gpencil_insert_to_array(src_array, dst_array, totpoints, gps_next, reverse, last); /* replace last end */ -- cgit v1.2.3