diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-11 16:35:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-11 16:35:50 +0400 |
| commit | 7620c2755442003470230c540c2389dd545b23e8 (patch) | |
| tree | 74f2012e1d05059b80a0cda2db98229bb9676a25 | |
| parent | 70ccdc6daa5619a4080ce2fe89c0f088fe54b80c (diff) | |
missed this change from patch [#30274]
| -rw-r--r-- | source/blender/editors/space_text/text_ops.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index f0275fb6584..1eba2deed96 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -2928,8 +2928,11 @@ static int text_insert_invoke(bContext *C, wmOperator *op, wmEvent *event) // if (!RNA_struct_property_is_set(op->ptr, "text")) { /* always set from keymap XXX */ if (!RNA_string_length(op->ptr, "text")) { - /* if alt/ctrl/super are pressed pass through */ - if (event->ctrl || event->oskey) { + /* if alt/ctrl/super are pressed pass through except for utf8 character event + * (when input method are used for utf8 inputs, the user may assign key event + * including alt/ctrl/super like ctrl+m to commit utf8 string. in such case, + * the modifiers in the utf8 character event make no sense.) */ + if ((event->ctrl || event->oskey) && !event->utf8_buf[0]) { return OPERATOR_PASS_THROUGH; } else { |