From b88ca3e6d113d161dd119bf1cec959c73b797af7 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 18 Mar 2020 10:38:37 -0600 Subject: 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 --- .../blender/editors/gpencil/gpencil_vertex_paint.c | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'source/blender/editors/gpencil/gpencil_vertex_paint.c') diff --git a/source/blender/editors/gpencil/gpencil_vertex_paint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c index 45dc22bafba..0c3b29ab1ea 100644 --- a/source/blender/editors/gpencil/gpencil_vertex_paint.c +++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c @@ -1308,7 +1308,7 @@ static int gp_vertexpaint_brush_modal(bContext *C, wmOperator *op, const wmEvent /* Abort painting if any of the usual things are tried */ case MIDDLEMOUSE: case RIGHTMOUSE: - case ESCKEY: + case EVT_ESCKEY: gp_vertexpaint_brush_exit(C, op); return OPERATOR_FINISHED; } @@ -1329,7 +1329,7 @@ static int gp_vertexpaint_brush_modal(bContext *C, wmOperator *op, const wmEvent /* Exit modal operator, based on the "standard" ops */ case RIGHTMOUSE: - case ESCKEY: + case EVT_ESCKEY: gp_vertexpaint_brush_exit(C, op); return OPERATOR_FINISHED; @@ -1344,24 +1344,24 @@ static int gp_vertexpaint_brush_modal(bContext *C, wmOperator *op, const wmEvent 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 */ -- cgit v1.2.3