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 --- source/blender/editors/gpencil/gpencil_primitive.c | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'source/blender/editors/gpencil/gpencil_primitive.c') diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 5cb34b1c08b..f7bfc0bab8c 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -1429,7 +1429,7 @@ static void gpencil_primitive_edit_event_handling( } break; } - case MKEY: { + case EVT_MKEY: { if ((event->val == KM_PRESS) && (tgpi->curve) && (ELEM(tgpi->orign_type, GP_STROKE_ARC))) { tgpi->flip ^= 1; gp_primitive_update_cps(tgpi); @@ -1437,7 +1437,7 @@ static void gpencil_primitive_edit_event_handling( } break; } - case EKEY: { + case EVT_EKEY: { if (tgpi->flag == IN_CURVE_EDIT && !ELEM(tgpi->type, GP_STROKE_BOX, GP_STROKE_CIRCLE)) { tgpi->flag = IN_PROGRESS; WM_cursor_modal_set(win, WM_CURSOR_NSEW_SCROLL); @@ -1544,7 +1544,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e gpencil_primitive_update(C, op, tgpi); break; } - case ESCKEY: + case EVT_ESCKEY: case LEFTMOUSE: { zero_v2(tgpi->move); tgpi->flag = IN_CURVE_EDIT; @@ -1566,7 +1566,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e switch (event->type) { - case ESCKEY: { + case EVT_ESCKEY: { /* return to normal cursor and header status */ ED_workspace_status_text(C, NULL); WM_cursor_modal_restore(win); @@ -1588,9 +1588,9 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case SPACEKEY: /* confirm */ + case EVT_SPACEKEY: /* confirm */ case MIDDLEMOUSE: - case RETKEY: + case EVT_RETKEY: case RIGHTMOUSE: { if (event->val == KM_PRESS) { tgpi->flag = IDLE; @@ -1612,7 +1612,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e gpencil_primitive_update(C, op, tgpi); break; } - case PADPLUSKEY: + case EVT_PADPLUSKEY: case WHEELUPMOUSE: { if ((event->val != KM_RELEASE)) { tgpi->tot_edges = tgpi->tot_edges + 1; @@ -1622,7 +1622,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case PADMINUS: + case EVT_PADMINUS: case WHEELDOWNMOUSE: { if ((event->val != KM_RELEASE)) { tgpi->tot_edges = tgpi->tot_edges - 1; @@ -1632,7 +1632,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case FKEY: /* brush thickness/ brush strength */ + case EVT_FKEY: /* brush thickness/ brush strength */ { if ((event->val == KM_PRESS)) { if (event->shift) { @@ -1658,7 +1658,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e gpencil_primitive_size(tgpi, false); gpencil_primitive_update(C, op, tgpi); break; - case ESCKEY: + case EVT_ESCKEY: case MIDDLEMOUSE: case LEFTMOUSE: tgpi->brush_size = 0; @@ -1681,7 +1681,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e gpencil_primitive_strength(tgpi, false); gpencil_primitive_update(C, op, tgpi); break; - case ESCKEY: + case EVT_ESCKEY: case MIDDLEMOUSE: case LEFTMOUSE: tgpi->brush_strength = 0.0f; @@ -1748,10 +1748,10 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case SPACEKEY: /* confirm */ + case EVT_SPACEKEY: /* confirm */ case MIDDLEMOUSE: - case PADENTER: - case RETKEY: { + case EVT_PADENTER: + case EVT_RETKEY: { tgpi->flag = IDLE; gpencil_primitive_interaction_end(C, op, win, tgpi); /* done! */ @@ -1769,7 +1769,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } ATTR_FALLTHROUGH; } - case ESCKEY: { + case EVT_ESCKEY: { /* return to normal cursor and header status */ ED_workspace_status_text(C, NULL); WM_cursor_modal_restore(win); @@ -1780,7 +1780,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e /* canceled! */ return OPERATOR_CANCELLED; } - case PADPLUSKEY: + case EVT_PADPLUSKEY: case WHEELUPMOUSE: { if ((event->val != KM_RELEASE)) { tgpi->tot_edges = tgpi->tot_edges + 1; @@ -1792,7 +1792,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case PADMINUS: + case EVT_PADMINUS: case WHEELDOWNMOUSE: { if ((event->val != KM_RELEASE)) { tgpi->tot_edges = tgpi->tot_edges - 1; @@ -1804,7 +1804,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case GKEY: /* grab mode */ + case EVT_GKEY: /* grab mode */ { if ((event->val == KM_PRESS)) { tgpi->flag = IN_MOVE; @@ -1812,7 +1812,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case FKEY: /* brush thickness/ brush strength */ + case EVT_FKEY: /* brush thickness/ brush strength */ { if ((event->val == KM_PRESS)) { if (event->shift) { @@ -1827,7 +1827,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case CKEY: /* curve mode */ + case EVT_CKEY: /* curve mode */ { if ((event->val == KM_PRESS) && (tgpi->orign_type == GP_STROKE_CURVE)) { switch (tgpi->type) { @@ -1846,7 +1846,7 @@ static int gpencil_primitive_modal(bContext *C, wmOperator *op, const wmEvent *e } break; } - case TABKEY: { + case EVT_TABKEY: { if (tgpi->flag == IN_CURVE_EDIT) { tgpi->flag = IN_PROGRESS; WM_cursor_modal_set(win, WM_CURSOR_NSEW_SCROLL); -- cgit v1.2.3