diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
commit | b88ca3e6d113d161dd119bf1cec959c73b797af7 (patch) | |
tree | 6a8b73ca95f8a21742cba1e764d1e24cc5ae8db5 /source/blender/editors/space_clip/tracking_ops.c | |
parent | 9e382dd2a3d8569201a3e5c1a8478166c77e9029 (diff) |
Cleanup: Resolve HKEY conflict
Both the MS headers and blender headers define the HKEY
which gives all kind of inclusion order issues.
This diff renames all *KEY constants to EVT_*KEY to resolve
this conflict.
Reviewed By: brecht , dfelinto
Differential Revision: http://developer.blender.org/D7164
Diffstat (limited to 'source/blender/editors/space_clip/tracking_ops.c')
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index aab60f8bc6e..3c25be9fe1e 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -189,7 +189,7 @@ static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const return OPERATOR_FINISHED; } - case ESCKEY: + case EVT_ESCKEY: ED_workspace_status_text(C, NULL); return OPERATOR_CANCELLED; } @@ -780,17 +780,17 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event) float dx, dy, mdelta[2]; switch (event->type) { - case LEFTCTRLKEY: - case RIGHTCTRLKEY: - case LEFTSHIFTKEY: - case RIGHTSHIFTKEY: + case EVT_LEFTCTRLKEY: + case EVT_RIGHTCTRLKEY: + case EVT_LEFTSHIFTKEY: + case EVT_RIGHTSHIFTKEY: if (data->action == SLIDE_ACTION_SIZE) { - if (ELEM(event->type, LEFTCTRLKEY, RIGHTCTRLKEY)) { + if (ELEM(event->type, EVT_LEFTCTRLKEY, EVT_RIGHTCTRLKEY)) { data->lock = event->val == KM_RELEASE; } } - if (ELEM(event->type, LEFTSHIFTKEY, RIGHTSHIFTKEY)) { + if (ELEM(event->type, EVT_LEFTSHIFTKEY, EVT_RIGHTSHIFTKEY)) { data->accurate = event->val == KM_PRESS; } ATTR_FALLTHROUGH; @@ -966,7 +966,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event) break; - case ESCKEY: + case EVT_ESCKEY: cancel_mouse_slide(op->customdata); free_slide_data(op->customdata); |