[Bf-blender-cvs] [2c6a1cbe968] asset-greasepencil: GPencil: Fix merge conflict

[Antonio Vazquez]

Commit: 2c6a1cbe968e6f5b04d31cb35dc0ff44ff43a76f
Author: Antonio Vazquez
Date:   Mon Aug 30 17:37:11 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rB2c6a1cbe968e6f5b04d31cb35dc0ff44ff43a76f

GPencil: Fix merge conflict

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 61be2d59d8c..bfec0dbaeb2 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -3406,6 +3406,8 @@ void ED_gpencil_layer_merge(bGPdata *gpd, bGPDlayer *gpl_src, bGPDlayer *gpl_dst
     bGPDframe *gpf_dst = BLI_ghash_lookup(gh_frames_dst, POINTER_FROM_INT(gpf_src->framenum));
     if (!gpf_dst) {
       gpf_dst = BKE_gpencil_layer_frame_get(gpl_dst, gpf_src->framenum, GP_GETFRAME_ADD_COPY);
+      /* Use same frame type. */
+      gpf_dst->key_type = gpf_src->key_type;
       BLI_ghash_insert(gh_frames_dst, POINTER_FROM_INT(gpf_src->framenum), gpf_dst);
     }
   }