[Bf-blender-cvs] [0cf46631e11] blender-v2.91-release: Fix T82356: Gpencil merge freezes Blender

[Antonio Vazquez]

Commit: 0cf46631e11a819aceece60e3b23491d22e9d077
Author: Antonio Vazquez
Date:   Tue Nov 3 16:38:43 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rB0cf46631e11a819aceece60e3b23491d22e9d077

Fix T82356: Gpencil merge freezes Blender

The `gps_next` variable had a typo error and was wrongly used as `gps->next`

===================================================================

M	source/blender/editors/gpencil/gpencil_merge.c

===================================================================

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 */