[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32409] trunk/blender/source/blender/ editors: Revert r32330 and reopening #24184.

[Nathan Letwory]

Revision: 32409
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32409
Author:   jesterking
Date:     2010-10-11 10:03:28 +0200 (Mon, 11 Oct 2010)

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

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-11 07:44:20 UTC (rev 32408)
+++ trunk/blender/source/blender/editors/space_console/console_ops.c	2010-10-11 08:03:28 UTC (rev 32409)
@@ -407,9 +407,13 @@
 	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);
 	}

Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c	2010-10-11 07:44:20 UTC (rev 32408)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c	2010-10-11 08:03:28 UTC (rev 32409)
@@ -2323,9 +2323,13 @@
 	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);
 	}