Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2020-03-18 19:38:37 +0300
committerRay Molenkamp <github@lazydodo.com>2020-03-18 19:38:37 +0300
commitb88ca3e6d113d161dd119bf1cec959c73b797af7 (patch)
tree6a8b73ca95f8a21742cba1e764d1e24cc5ae8db5 /source/blender/editors/animation/anim_ops.c
parent9e382dd2a3d8569201a3e5c1a8478166c77e9029 (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/anim_ops.c')
-rw-r--r--source/blender/editors/animation/anim_ops.c6
1 files changed, 3 insertions, 3 deletions
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);
}