diff options
| author | Antonioya <blendergit@gmail.com> | 2018-12-17 13:34:33 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-12-17 13:34:50 +0300 |
| commit | 7d36a2a7753e89c86f40ffd7a1607c4888137171 (patch) | |
| tree | e7805890a34bc8bd1085d4f0af674f9ef6e33ec3 /source/blender/editors/gpencil | |
| parent | b253fe4d1b84a4cb42fcabf4fad6611034b505c2 (diff) | |
Fix T59483: Grease Pencil Additive Drawing mode doesn't work with shapes
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 10 |
1 files changed, 9 insertions, 1 deletions
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; |