diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-20 07:19:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-20 07:19:05 +0300 |
| commit | 65aab6cdae822822122f5e180baf10e39f600bf2 (patch) | |
| tree | fc8556ec5590a0e47c41e2c18131fede4b67732b /source/blender/editors/gpencil | |
| parent | 996bf65730257d0a80c6ada03a38d0a321b1e87e (diff) | |
| parent | 81e584ed17902878579131776b4e5a9f7b54cdab (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_interpolate.c | 2 |
1 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 6947ca6b376..59b5b41f114 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -625,6 +625,7 @@ static int gpencil_interpolate_modal(bContext *C, wmOperator *op, const wmEvent break; } default: + { if ((event->val == KM_PRESS) && handleNumInput(C, &tgpi->num, event)) { const float factor = tgpi->init_factor; float value; @@ -649,6 +650,7 @@ static int gpencil_interpolate_modal(bContext *C, wmOperator *op, const wmEvent /* unhandled event - allow to pass through */ return OPERATOR_RUNNING_MODAL | OPERATOR_PASS_THROUGH; } + } } /* still running... */ |