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/animation | |
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/animation')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 6 | ||||
-rw-r--r-- | source/blender/editors/animation/anim_ops.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 93cb2d1e306..4e2b126e2fb 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -965,7 +965,7 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even else { bool handled = false; switch (event->type) { - case ESCKEY: + case EVT_ESCKEY: ed_marker_move_cancel(C, op); return OPERATOR_CANCELLED; case RIGHTMOUSE: @@ -977,8 +977,8 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even /* else continue; <--- see if release event should be caught for tweak-end */ ATTR_FALLTHROUGH; - case RETKEY: - case PADENTER: + case EVT_RETKEY: + case EVT_PADENTER: case LEFTMOUSE: case MIDDLEMOUSE: if (WM_event_is_modal_tweak_exit(event, mm->event_type)) { diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index fb045abe016..a85ec8a5d14 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -215,7 +215,7 @@ static int change_frame_modal(bContext *C, wmOperator *op, const wmEvent *event) int ret = OPERATOR_RUNNING_MODAL; /* execute the events */ switch (event->type) { - case ESCKEY: + case EVT_ESCKEY: ret = OPERATOR_FINISHED; break; @@ -233,8 +233,8 @@ static int change_frame_modal(bContext *C, wmOperator *op, const wmEvent *event) } break; - case LEFTCTRLKEY: - case RIGHTCTRLKEY: + case EVT_LEFTCTRLKEY: + case EVT_RIGHTCTRLKEY: if (event->val == KM_RELEASE) { RNA_boolean_set(op->ptr, "snap", false); } |