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/interface/view2d_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/interface/view2d_ops.c')
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 2c9803d1dd3..8116029af59 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -306,7 +306,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) } #endif default: - if (event->type == vpd->invoke_event || event->type == ESCKEY) { + if (event->type == vpd->invoke_event || event->type == EVT_ESCKEY) { if (event->val == KM_RELEASE) { /* calculate overall delta mouse-movement for redo */ RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx)); @@ -1244,7 +1244,7 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, const wmEvent *event /* apply zooming */ view_zoomdrag_apply(C, op); } - else if (event->type == vzd->invoke_event || event->type == ESCKEY) { + else if (event->type == vzd->invoke_event || event->type == EVT_ESCKEY) { if (event->val == KM_RELEASE) { /* for redo, store the overall deltas - need to respect zoom-locks here... */ |