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/uvedit/uvedit_smart_stitch.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/uvedit/uvedit_smart_stitch.c')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 5544c5cee63..d6652aca216 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -2608,13 +2608,13 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_PASS_THROUGH; /* Cancel */ - case ESCKEY: + case EVT_ESCKEY: stitch_cancel(C, op); return OPERATOR_CANCELLED; case LEFTMOUSE: - case PADENTER: - case RETKEY: + case EVT_PADENTER: + case EVT_RETKEY: if (event->val == KM_PRESS) { if (stitch_process_data(ssc, active_state, scene, true)) { stitch_exit(C, op, 1); @@ -2629,7 +2629,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_PASS_THROUGH; } /* Increase limit */ - case PADPLUSKEY: + case EVT_PADPLUSKEY: case WHEELUPMOUSE: if (event->val == KM_PRESS && event->alt) { ssc->limit_dist += 0.01f; @@ -2643,7 +2643,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_PASS_THROUGH; } /* Decrease limit */ - case PADMINUS: + case EVT_PADMINUS: case WHEELDOWNMOUSE: if (event->val == KM_PRESS && event->alt) { ssc->limit_dist -= 0.01f; @@ -2659,7 +2659,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) } /* Use Limit (Default off) */ - case LKEY: + case EVT_LKEY: if (event->val == KM_PRESS) { ssc->use_limit = !ssc->use_limit; if (!stitch_process_data(ssc, active_state, scene, false)) { @@ -2670,7 +2670,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) } return OPERATOR_RUNNING_MODAL; - case IKEY: + case EVT_IKEY: if (event->val == KM_PRESS) { /* Move to next island and maybe next object */ @@ -2694,7 +2694,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) } return OPERATOR_RUNNING_MODAL; - case MKEY: + case EVT_MKEY: if (event->val == KM_PRESS) { ssc->midpoints = !ssc->midpoints; if (!stitch_process_data(ssc, active_state, scene, false)) { @@ -2722,7 +2722,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; /* snap islands on/off */ - case SKEY: + case EVT_SKEY: if (event->val == KM_PRESS) { ssc->snap_islands = !ssc->snap_islands; if (!stitch_process_data(ssc, active_state, scene, false)) { @@ -2736,7 +2736,7 @@ static int stitch_modal(bContext *C, wmOperator *op, const wmEvent *event) } /* switch between edge/vertex mode */ - case TABKEY: + case EVT_TABKEY: if (event->val == KM_PRESS) { stitch_switch_selection_mode_all(ssc); |