diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-11 12:03:28 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-11 12:03:28 +0400 |
commit | 67a1a871a9be8b62344efc3ba1c312dce535da09 (patch) | |
tree | c34d0c338e0f3895401339ec44862541c294cd17 | |
parent | 3d3d9bf23509e372843ae23f0c9f0fff2c3db7b9 (diff) |
Revert r32330 and reopening #24184. The change breaks input where modifier key is used to create a character.
-rw-r--r-- | source/blender/editors/space_console/console_ops.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_ops.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index 4e50b589bc6..a84a592279e 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -407,9 +407,13 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) if(!RNA_string_length(op->ptr, "text")) { char str[2] = {event->ascii, '\0'}; + /* XXX NOTE: Reverting this change from r32330, since it + * breaks input for cases where modifierkey is needed to + * create characters. + */ /* if alt/ctrl/super are pressed pass through */ - if(event->alt || event->ctrl || event->oskey) - return OPERATOR_PASS_THROUGH; + //if(event->alt || event->ctrl || event->oskey) + // return OPERATOR_PASS_THROUGH; RNA_string_set(op->ptr, "text", str); } diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index e3bf390dba8..f6a4488966d 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -2323,9 +2323,13 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event) if(!RNA_string_length(op->ptr, "text")) { char str[2] = {event->ascii, '\0'}; + /* XXX NOTE: Reverting this change from r32330, since it + * breaks input for cases where modifierkey is needed to + * create characters. + */ /* if alt/ctrl/super are pressed pass through */ - if(event->alt || event->ctrl || event->oskey) - return OPERATOR_PASS_THROUGH; + //if(event->alt || event->ctrl || event->oskey) + // return OPERATOR_PASS_THROUGH; RNA_string_set(op->ptr, "text", str); } |