diff options
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index c02bbafce15..32c4ec21e13 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -2199,15 +2199,11 @@ static int ui_do_but_HOTKEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data /* always set */ but->modifier_key = 0; - if(event->shift) - but->modifier_key |= KM_SHIFT; - if(event->alt) - but->modifier_key |= KM_ALT; - if(event->ctrl) - but->modifier_key |= KM_CTRL; - if(event->oskey) - but->modifier_key |= KM_OSKEY; - + if(event->shift) but->modifier_key |= KM_SHIFT; + if(event->alt) but->modifier_key |= KM_ALT; + if(event->ctrl) but->modifier_key |= KM_CTRL; + if(event->oskey) but->modifier_key |= KM_OSKEY; + ui_check_but(but); ED_region_tag_redraw(data->region); @@ -3673,7 +3669,7 @@ static int ui_do_but_CURVE(bContext *C, uiBlock *block, uiBut *but, uiHandleButt if(sel!= -1) { /* ok, we move a point */ /* deselect all if this one is deselect. except if we hold shift */ - if(event->shift==0) { + if(event->shift == FALSE) { for(a=0; a<cuma->totpoint; a++) cmp[a].flag &= ~SELECT; cmp[sel].flag |= SELECT; @@ -3712,7 +3708,7 @@ static int ui_do_but_CURVE(bContext *C, uiBlock *block, uiBut *but, uiHandleButt if(!data->dragchange) { /* deselect all, select one */ - if(event->shift==0) { + if(event->shift == FALSE) { for(a=0; a<cuma->totpoint; a++) cmp[a].flag &= ~SELECT; cmp[data->dragsel].flag |= SELECT; @@ -4491,7 +4487,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) ui_but_drop (C, event, but, data); } /* handle keyframing */ - else if(event->type == IKEY && !ELEM3(1, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) { + else if(event->type == IKEY && !ELEM3(KM_MOD_FIRST, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) { if(event->alt) ui_but_anim_delete_keyframe(C); else @@ -4502,7 +4498,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) return WM_UI_HANDLER_BREAK; } /* handle drivers */ - else if(event->type == DKEY && !ELEM3(1, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) { + else if(event->type == DKEY && !ELEM3(KM_MOD_FIRST, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) { if(event->alt) ui_but_anim_remove_driver(C); else @@ -4513,7 +4509,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) return WM_UI_HANDLER_BREAK; } /* handle keyingsets */ - else if(event->type == KKEY && !ELEM3(1, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) { + else if(event->type == KKEY && !ELEM3(KM_MOD_FIRST, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) { if(event->alt) ui_but_anim_remove_keyingset(C); else @@ -5983,9 +5979,9 @@ static int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle case ZKEY: { if( (event->val == KM_PRESS) && - (event->shift == FALSE) && - (event->ctrl == FALSE) && - (event->oskey == FALSE) + (event->shift == FALSE) && + (event->ctrl == FALSE) && + (event->oskey == FALSE) ) { for(but= block->buttons.first; but; but= but->next) { |