[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32436] trunk/blender/source/blender/ editors: re-enable fix from r32330 but without the alt key check because this can be used for input .

[Campbell Barton]

Revision: 32436
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32436
Author:   campbellbarton
Date:     2010-10-13 03:30:42 +0200 (Wed, 13 Oct 2010)

Log Message:
-----------
re-enable fix from r32330 but without the alt key check because this can be used for input.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_console/console_ops.c
    trunk/blender/source/blender/editors/space_text/text_ops.c

Modified: trunk/blender/source/blender/editors/space_console/console_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_ops.c	2010-10-13 01:10:56 UTC (rev 32435)
+++ trunk/blender/source/blender/editors/space_console/console_ops.c	2010-10-13 01:30:42 UTC (rev 32436)
@@ -406,14 +406,9 @@
 	// 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);
 	}

Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c	2010-10-13 01:10:56 UTC (rev 32435)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c	2010-10-13 01:30:42 UTC (rev 32436)
@@ -2322,14 +2322,9 @@
 	// 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);
 	}