archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use macro to set flags

Browse Source
This commit is contained in:
Campbell Barton
2019-01-25 00:34:36 +11:00
parent 6d58339973
commit b1f3a86d99
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/windowmanager/intern/wm_playanim.c
View File

@@ -215,30 +215,24 @@ static void playanim_event_qual_update(void)
/* Shift */ /* Shift */
GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftShift, &val); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftShift, &val);
if (val) g_WS.qual |= WS_QUAL_LSHIFT; SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_LSHIFT);
else g_WS.qual &= ~WS_QUAL_LSHIFT;
GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightShift, &val); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightShift, &val);
if (val) g_WS.qual |= WS_QUAL_RSHIFT; SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_RSHIFT);
else g_WS.qual &= ~WS_QUAL_RSHIFT;
/* Control */ /* Control */
GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftControl, &val); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftControl, &val);
if (val) g_WS.qual |= WS_QUAL_LCTRL; SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_LCTRL);
else g_WS.qual &= ~WS_QUAL_LCTRL;
GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightControl, &val); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightControl, &val);
if (val) g_WS.qual |= WS_QUAL_RCTRL; SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_RCTRL);
else g_WS.qual &= ~WS_QUAL_RCTRL;
/* Alt */ /* Alt */
GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftAlt, &val); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftAlt, &val);
if (val) g_WS.qual |= WS_QUAL_LALT; SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_LALT);
else g_WS.qual &= ~WS_QUAL_LALT;
GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightAlt, &val); GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightAlt, &val);
if (val) g_WS.qual |= WS_QUAL_RALT; SET_FLAG_FROM_TEST(g_WS.qual, val, WS_QUAL_RALT);
else g_WS.qual &= ~WS_QUAL_RALT;
} }
typedef struct PlayAnimPict { typedef struct PlayAnimPict {