From b1f3a86d999b6742d783de5a11d7de0c54cf5891 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Jan 2019 00:34:36 +1100 Subject: Cleanup: use macro to set flags --- source/blender/windowmanager/intern/wm_playanim.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'source') diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 87737229d83..17408dcd61d 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -215,30 +215,24 @@ static void playanim_event_qual_update(void) /* Shift */ GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftShift, &val); - if (val) g_WS.qual |= WS_QUAL_LSHIFT; - else g_WS.qual &= ~WS_QUAL_LSHIFT; + SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_LSHIFT); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightShift, &val); - if (val) g_WS.qual |= WS_QUAL_RSHIFT; - else g_WS.qual &= ~WS_QUAL_RSHIFT; + SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_RSHIFT); /* Control */ GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftControl, &val); - if (val) g_WS.qual |= WS_QUAL_LCTRL; - else g_WS.qual &= ~WS_QUAL_LCTRL; + SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_LCTRL); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightControl, &val); - if (val) g_WS.qual |= WS_QUAL_RCTRL; - else g_WS.qual &= ~WS_QUAL_RCTRL; + SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_RCTRL); /* Alt */ GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftAlt, &val); - if (val) g_WS.qual |= WS_QUAL_LALT; - else g_WS.qual &= ~WS_QUAL_LALT; + SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_LALT); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightAlt, &val); - if (val) g_WS.qual |= WS_QUAL_RALT; - else g_WS.qual &= ~WS_QUAL_RALT; + SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_RALT); } typedef struct PlayAnimPict { -- cgit v1.2.3