Skip to content
Snippets Groups Projects
Commit 7e12d92f authored by Campbell Barton's avatar Campbell Barton
Browse files

Fix invalid value for ENUM_OPERATORS(...) macro

Use defines for multiple flags.
parent 609ac5e3
Branches
Tags
No related merge requests found
...@@ -149,19 +149,19 @@ static bool buffer_from_filepath(const char *filepath, void **r_mem, size_t *r_s ...@@ -149,19 +149,19 @@ static bool buffer_from_filepath(const char *filepath, void **r_mem, size_t *r_s
enum eWS_Qual { enum eWS_Qual {
WS_QUAL_LSHIFT = (1 << 0), WS_QUAL_LSHIFT = (1 << 0),
WS_QUAL_RSHIFT = (1 << 1), WS_QUAL_RSHIFT = (1 << 1),
WS_QUAL_SHIFT = (WS_QUAL_LSHIFT | WS_QUAL_RSHIFT), #define WS_QUAL_SHIFT (WS_QUAL_LSHIFT | WS_QUAL_RSHIFT)
WS_QUAL_LALT = (1 << 2), WS_QUAL_LALT = (1 << 2),
WS_QUAL_RALT = (1 << 3), WS_QUAL_RALT = (1 << 3),
WS_QUAL_ALT = (WS_QUAL_LALT | WS_QUAL_RALT), #define WS_QUAL_ALT (WS_QUAL_LALT | WS_QUAL_RALT)
WS_QUAL_LCTRL = (1 << 4), WS_QUAL_LCTRL = (1 << 4),
WS_QUAL_RCTRL = (1 << 5), WS_QUAL_RCTRL = (1 << 5),
WS_QUAL_CTRL = (WS_QUAL_LCTRL | WS_QUAL_RCTRL), #define WS_QUAL_CTRL (WS_QUAL_LCTRL | WS_QUAL_RCTRL)
WS_QUAL_LMOUSE = (1 << 16), WS_QUAL_LMOUSE = (1 << 16),
WS_QUAL_MMOUSE = (1 << 17), WS_QUAL_MMOUSE = (1 << 17),
WS_QUAL_RMOUSE = (1 << 18), WS_QUAL_RMOUSE = (1 << 18),
WS_QUAL_MOUSE = (WS_QUAL_LMOUSE | WS_QUAL_MMOUSE | WS_QUAL_RMOUSE), #define WS_QUAL_MOUSE (WS_QUAL_LMOUSE | WS_QUAL_MMOUSE | WS_QUAL_RMOUSE)
}; };
ENUM_OPERATORS(eWS_Qual, WS_QUAL_MOUSE) ENUM_OPERATORS(eWS_Qual, WS_QUAL_RMOUSE)
struct GhostData { struct GhostData {
GHOST_SystemHandle system; GHOST_SystemHandle system;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment