diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-11-03 18:39:27 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-11-03 18:39:27 +0300 |
| commit | 5deb2d42d957a0992cf5285ddc988e06c3990009 (patch) | |
| tree | 5759ddea76181c53e84a6cdc5574e1bcceb90785 /source/blender/editors/gpencil | |
| parent | 6fdcca8de64cd70f237640b67ce2d0068b918d05 (diff) | |
| parent | 0cf46631e11a819aceece60e3b23491d22e9d077 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |