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/gpencil/gpencil_sculpt_paint.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/gpencil/gpencil_sculpt_paint.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_sculpt_paint.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/editors/gpencil/gpencil_sculpt_paint.c b/source/blender/editors/gpencil/gpencil_sculpt_paint.c index 5db331280f8..8c92d53b8e6 100644 --- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c +++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c @@ -2028,7 +2028,7 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even /* Abort painting if any of the usual things are tried */ case MIDDLEMOUSE: case RIGHTMOUSE: - case ESCKEY: + case EVT_ESCKEY: gpsculpt_brush_exit(C, op); return OPERATOR_FINISHED; } @@ -2050,7 +2050,7 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even /* Exit modal operator, based on the "standard" ops */ case RIGHTMOUSE: - case ESCKEY: + case EVT_ESCKEY: gpsculpt_brush_exit(C, op); return OPERATOR_FINISHED; @@ -2065,24 +2065,24 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even break; /* Change Frame - Allowed */ - case LEFTARROWKEY: - case RIGHTARROWKEY: - case UPARROWKEY: - case DOWNARROWKEY: + case EVT_LEFTARROWKEY: + case EVT_RIGHTARROWKEY: + case EVT_UPARROWKEY: + case EVT_DOWNARROWKEY: return OPERATOR_PASS_THROUGH; /* Camera/View Gizmo's - Allowed */ /* (See rationale in gpencil_paint.c -> gpencil_draw_modal()) */ - case PAD0: - case PAD1: - case PAD2: - case PAD3: - case PAD4: - case PAD5: - case PAD6: - case PAD7: - case PAD8: - case PAD9: + case EVT_PAD0: + case EVT_PAD1: + case EVT_PAD2: + case EVT_PAD3: + case EVT_PAD4: + case EVT_PAD5: + case EVT_PAD6: + case EVT_PAD7: + case EVT_PAD8: + case EVT_PAD9: return OPERATOR_PASS_THROUGH; /* Unhandled event */ |