diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-25 18:31:47 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-25 22:26:29 +0400 |
| commit | b638696ca6122063312cddce1175535413b3725c (patch) | |
| tree | 816b39caa214599cc14e9b60dc811f78c5126aae /source/blender/editors/util/numinput.c | |
| parent | 33a54422b1e1b2616591ebc3442fee762596f5bd (diff) | |
Fix T41534: Bevel practically unusable interactively if set to percent amount type.
Turned out to be a clean/fix up of modal bevel tool, percentage mode handling was broken,
numinput handling was broken, etc.
Also added a way to switch between bevel types (modes) with M key, and tweaked a bit
numinput code to return early in case of 'char' event with ctrl modifier.
Diffstat (limited to 'source/blender/editors/util/numinput.c')
| -rw-r--r-- | source/blender/editors/util/numinput.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c index fd8f16f5d02..aade6d7b7e8 100644 --- a/source/blender/editors/util/numinput.c +++ b/source/blender/editors/util/numinput.c @@ -442,6 +442,13 @@ bool handleNumInput(bContext *C, NumInput *n, const wmEvent *event) } } + /* Up to this point, if we have a ctrl modifier, skip. + * This allows to still access most of modals' shortcuts even in numinput mode. + */ + if (!updated && event->ctrl) { + return false; + } + if ((!utf8_buf || !utf8_buf[0]) && ascii[0]) { /* Fallback to ascii. */ utf8_buf = ascii; |