diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-10-27 17:15:11 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-10-27 17:15:11 +0400 |
| commit | 16544fb54b950e84d4fc67b9ad4f81065992707e (patch) | |
| tree | ba509f54075b0030c84348abf871aaec0038b47b /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | 601cd0215c1334a7f14b0df8954ea0f89a44380a (diff) | |
Putting back mysterious lines that check KM_CLICK keymap conflicts
It's a real puzzle this click bizz!
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 02dc77171d5..bcddc984ed3 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -957,6 +957,11 @@ int WM_keymap_item_compare(wmKeyMapItem *k1, wmKeyMapItem *k2) return 0; if (k1->val != KM_ANY && k2->val != KM_ANY) { + /* take click, press, release conflict into account */ + if (k1->val == KM_CLICK && ELEM3(k2->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0) + return 0; + if (k2->val == KM_CLICK && ELEM3(k1->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0) + return 0; if (k1->val != k2->val) return 0; } |