diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-24 14:48:54 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-24 14:48:54 +0300 |
| commit | e6c6db9af437379137aaa2b9db101134fe16d5f0 (patch) | |
| tree | ac1fab737099b89b4457a234c6048328afe82064 /source/blender/editors/gpencil | |
| parent | 672f6b79fbb356474f280c85664a352c1f4c0f26 (diff) | |
| parent | 88a346420beb9544afecbc96292a35900e845255 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_interpolate.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_primitive.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index 1438c33a972..3c4d43b5f53 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -585,6 +585,7 @@ static int gpencil_interpolate_modal(bContext *C, wmOperator *op, const wmEvent switch (event->type) { case LEFTMOUSE: /* confirm */ + case PADENTER: case RETKEY: { /* return to normal cursor and header status */ ED_area_status_text(tgpi->sa, NULL); diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index e19be2fe086..f0ff38e60b1 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -1772,6 +1772,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } case SPACEKEY: /* confirm */ case MIDDLEMOUSE: + case PADENTER: case RETKEY: { tgpi->flag = IDLE; gpencil_primitive_interaction_end(C, op, win, tgpi); |