[Bf-blender-cvs] [7d36a2a7753] blender2.8: Fix T59483: Grease Pencil Additive Drawing mode doesn't work with shapes

[Antonioya]

Commit: 7d36a2a7753e89c86f40ffd7a1607c4888137171
Author: Antonioya
Date:   Mon Dec 17 11:34:33 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB7d36a2a7753e89c86f40ffd7a1607c4888137171

Fix T59483: Grease Pencil Additive Drawing mode doesn't work with shapes

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 5cc06946544..e32639b1039 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -1136,7 +1136,15 @@ static void gpencil_primitive_interaction_end(bContext *C, wmOperator *op, wmWin
 	WM_cursor_modal_restore(win);
 
 	/* insert keyframes as required... */
-	gpf = BKE_gpencil_layer_getframe(tgpi->gpl, tgpi->cframe, GP_GETFRAME_ADD_NEW);
+	short add_frame_mode;
+	if (ts->gpencil_flags & GP_TOOL_FLAG_RETAIN_LAST) {
+		add_frame_mode = GP_GETFRAME_ADD_COPY;
+	}
+	else {
+		add_frame_mode = GP_GETFRAME_ADD_NEW;
+	}
+
+	gpf = BKE_gpencil_layer_getframe(tgpi->gpl, tgpi->cframe, add_frame_mode);
 
 	/* prepare stroke to get transferred */
 	gps = tgpi->gpf->strokes.first;