Merge branch 'blender-v2.81-release'

This commit is contained in:
Antonio Vazquez 2019-10-24 13:48:54 +02:00
commit e6c6db9af4
2 changed files with 2 additions and 0 deletions

View File

@ -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);

View File

@ -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);