[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20884] branches/blender2.5/blender/source /blender/editors/interface/interface_handlers.c: Standarizing on control for unconditionally entering keyboard input edit mode .

[gsr b3d]

Revision: 20884
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20884
Author:   gsrb3d
Date:     2009-06-14 22:26:20 +0200 (Sun, 14 Jun 2009)

Log Message:
-----------
Standarizing on control for unconditionally entering keyboard input edit mode.
(Outliner uses this because shift is used for multiple select)

Modified Paths:
--------------
    
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c

Modified: 
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
   2009-06-14 20:01:12 UTC (rev 20883)
+++ 
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
   2009-06-14 20:26:20 UTC (rev 20884)
@@ -1774,7 +1774,7 @@
                        click= 1;
                }
                else if(event->val==KM_PRESS) {
-                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && 
event->shift) {
+                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && 
event->ctrl) {
                                button_activate_state(C, but, 
BUTTON_STATE_TEXT_EDITING);
                                retval= WM_UI_HANDLER_BREAK;
                        }
@@ -1985,7 +1985,7 @@
                        click= 2;
                }
                else if(event->val==KM_PRESS) {
-                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && 
event->shift) {
+                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && 
event->ctrl) {
                                button_activate_state(C, but, 
BUTTON_STATE_TEXT_EDITING);
                                retval= WM_UI_HANDLER_BREAK;
                        }
@@ -2027,7 +2027,7 @@
        }
 
        if(click) {
-               if (event->ctrl || click==2) {
+               if (click==2) {
                        /* nudge slider to the left or right */
                        float f, tempf, softmin, softmax, softrange;
                        int temp;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs