[Bf-blender-cvs] [b1f3a86d999] master: Cleanup: use macro to set flags

[Campbell Barton]

Commit: b1f3a86d999b6742d783de5a11d7de0c54cf5891
Author: Campbell Barton
Date:   Fri Jan 25 00:34:36 2019 +1100
Branches: master
https://developer.blender.org/rBb1f3a86d999b6742d783de5a11d7de0c54cf5891

Cleanup: use macro to set flags

===================================================================

M       source/blender/windowmanager/intern/wm_playanim.c

===================================================================

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 {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs