Revision: 48833
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48833
Author: campbellbarton
Date: 2012-07-11 12:35:50 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
missed this change from patch [#30274]
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_text/text_ops.c
Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c 2012-07-11
11:31:14 UTC (rev 48832)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c 2012-07-11
12:35:50 UTC (rev 48833)
@@ -2928,8 +2928,11 @@
// 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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
