sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Revert r32330 and reopening #24184. The change breaks input where modifier key is used to create a character.

Browse Source
This commit is contained in:
Nathan Letwory 2010-10-11 08:03:28 +00:00
parent 3d3d9bf235
commit 67a1a871a9
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_console/console_ops.c
View File

@ -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);
}

8
source/blender/editors/space_text/text_ops.c
View File

@ -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);
}