Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-06-15 00:26:20 +0400
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-06-15 00:26:20 +0400
commitc12d5d61a89e549dd4a07abf65d54d2768c1df76 (patch)
treefd6b8538f63a3327451e9cab8cd663ed849c0c8f /source/blender/editors/interface/interface_handlers.c
parent03bd1367ac79f5a34a7c39704d19e067ef69f1c0 (diff)
Standarizing on control for unconditionally entering keyboard input edit mode.
(Outliner uses this because shift is used for multiple select)
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
-rw-r--r--source/blender/editors/interface/interface_handlers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 0f6dbc430fb..6ec809b7178 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1774,7 +1774,7 @@ static int ui_do_but_NUM(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
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 @@ static int ui_do_but_SLI(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
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 @@ static int ui_do_but_SLI(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
}
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;