[Bf-blender-cvs] [e8684eff301] master: Fix T91056: GPencil merge layers doesn't preseve Keyframe type.

[Antonio Vazquez]

Commit: e8684eff301d09e25b4e7ef6221a5289661da2e3
Author: Antonio Vazquez
Date:   Mon Aug 30 17:04:02 2021 +0200
Branches: master
https://developer.blender.org/rBe8684eff301d09e25b4e7ef6221a5289661da2e3

Fix T91056: GPencil merge layers doesn't preseve Keyframe type.

Now if the frame does not exist in destination layer, the frame type of merge layer is used. 

For existing frames in destination layer, the existing type is not changed.

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 8baac26bed3..a77d3bee025 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1347,6 +1347,8 @@ static int gpencil_merge_layer_exec(bContext *C, wmOperator *op)
     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);
     }
   }