forked from bartvdbraak/blender
Revert r32330 and reopening #24184. The change breaks input where modifier key is used to create a character.
This commit is contained in:
parent
3d3d9bf235
commit
67a1a871a9
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user