Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-13 05:30:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-13 05:30:42 +0400
commit74dd22a228db0312049f0b23f1ce63a766202272 (patch)
tree0aaf7d12afdce22005700ffaa39c6fca73da5b23 /source/blender/editors/space_text/text_ops.c
parent9347dd04a30ea091df4cc5d54af5a84e83652afc (diff)
re-enable fix from r32330 but without the alt key check because this can be used for input.
Diffstat (limited to 'source/blender/editors/space_text/text_ops.c')
-rw-r--r--source/blender/editors/space_text/text_ops.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index f6a4488966d..f8abe0f1900 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -2322,14 +2322,9 @@ static int insert_invoke(bContext *C, wmOperator *op, wmEvent *event)
// if(!RNA_property_is_set(op->ptr, "text")) { /* always set from keymap XXX */
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->ctrl || event->oskey)
+ return OPERATOR_PASS_THROUGH;
RNA_string_set(op->ptr, "text", str);
}