blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-06-08 14:57:17 +02:00
parent d97df0d0e6 4127aeb7a5
commit 97e7d9f90b
Notes: blender-bot 2023-04-04 07:45:26 +02:00 
Referenced by issue #55408, Double transforms on parents/children
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/ghost/intern/GHOST_SystemX11.cpp
View File

@ -1841,6 +1841,9 @@ convertXKey(KeySym key)
GXMAP(type, XF86XK_AudioForward, GHOST_kKeyMediaLast);
#endif
#endif
/* Non US keyboard layouts: avoid 'UnknownKey' - TODO(campbell): lookup scan-codes. */
GXMAP(type, XK_dead_circumflex, GHOST_kKeyAccentGrave); /* 'de' */
GXMAP(type, XK_twosuperior, GHOST_kKeyAccentGrave); /* 'fr' */
default:
type = GHOST_kKeyUnknown;
break;

7
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -2559,8 +2559,11 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
if (win != NULL) {
if (event->val == KM_PRESS) {
win->eventstate->check_click = true;
win->eventstate->check_drag = true;
/* Ensure the types match to prevent mouse wheel from triggering drag/clicks. */
if (event->type == win->eventstate->prevtype) {
win->eventstate->check_click = true;
win->eventstate->check_drag = true;
}
}
else if (event->val == KM_RELEASE) {
win->eventstate->check_drag = false;