diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-19 19:30:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-19 19:33:40 +0400 |
| commit | 00b29156e087bba3675c7247ffe64a1696a90558 (patch) | |
| tree | 334d5be951b6d69873908dfdfe6b29439788aaab /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | 7e8626bbcec21c682dc9159fe0307d157c56ede4 (diff) | |
Defines: replace ELEM3-16 with ELEM(...), that can take varargs
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 0163517545f..a95f2af1a8f 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1108,9 +1108,9 @@ int WM_keymap_item_compare(wmKeyMapItem *k1, wmKeyMapItem *k2) 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) + if (k1->val == KM_CLICK && ELEM(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) + if (k2->val == KM_CLICK && ELEM(k1->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0) return 0; if (k1->val != k2->val) return 0; |