diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-20 18:52:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-20 19:09:56 +0300 |
commit | 661d363e13ff3c86b30d09333e5334146e5da79f (patch) | |
tree | 9819fb8cf5224f0b8aa76a216217cbfb4f8089db /source/blender/editors/space_clip | |
parent | a5f19e3f7270b335d324c4fa5a9ca33e59376ef0 (diff) |
Fix T73162: Modal tools cant be mapped to MMB
Also rename struct members to 'launch_event', since it's more
descriptive and was called this in some places.
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops_plane.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 4a4b85cbf8f..3ede0158f7a 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -374,7 +374,7 @@ void CLIP_OT_reload(wmOperatorType *ot) typedef struct ViewPanData { float x, y; float xof, yof, xorig, yorig; - int event_type; + int launch_event; bool own_cursor; float *vec; } ViewPanData; @@ -406,7 +406,7 @@ static void view_pan_init(bContext *C, wmOperator *op, const wmEvent *event) copy_v2_v2(&vpd->xof, vpd->vec); copy_v2_v2(&vpd->xorig, &vpd->xof); - vpd->event_type = event->type; + vpd->launch_event = WM_userdef_event_type_from_keymap_type(event->type); WM_event_add_modal_handler(C, op); } @@ -493,7 +493,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED; default: - if (event->type == vpd->event_type && event->val == KM_RELEASE) { + if (event->type == vpd->launch_event && event->val == KM_RELEASE) { view_pan_exit(C, op, 0); return OPERATOR_FINISHED; @@ -548,7 +548,7 @@ void CLIP_OT_view_pan(wmOperatorType *ot) typedef struct ViewZoomData { float x, y; float zoom; - int event_type; + int launch_event; float location[2]; wmTimer *timer; double timer_lastdraw; @@ -579,7 +579,7 @@ static void view_zoom_init(bContext *C, wmOperator *op, const wmEvent *event) vpd->x = event->x; vpd->y = event->y; vpd->zoom = sc->zoom; - vpd->event_type = event->type; + vpd->launch_event = WM_userdef_event_type_from_keymap_type(event->type); ED_clip_mouse_pos(sc, ar, event->mval, vpd->location); @@ -697,7 +697,7 @@ static int view_zoom_modal(bContext *C, wmOperator *op, const wmEvent *event) view_zoom_apply(C, vpd, op, event, use_cursor_init && (U.uiflag & USER_ZOOM_TO_MOUSEPOS)); break; default: - if (event->type == vpd->event_type && event->val == KM_RELEASE) { + if (event->type == vpd->launch_event && event->val == KM_RELEASE) { view_zoom_exit(C, op, 0); return OPERATOR_FINISHED; diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c index 7d2324d3f48..03fe1c74e2a 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.c +++ b/source/blender/editors/space_clip/tracking_ops_plane.c @@ -98,7 +98,7 @@ void CLIP_OT_create_plane_track(wmOperatorType *ot) /********************** Slide plane marker corner operator *********************/ typedef struct SlidePlaneMarkerData { - int event_type; + int launch_event; MovieTrackingPlaneTrack *plane_track; MovieTrackingPlaneMarker *plane_marker; int width, height; @@ -195,7 +195,7 @@ static void *slide_plane_marker_customdata(bContext *C, const wmEvent *event) customdata = MEM_callocN(sizeof(SlidePlaneMarkerData), "slide plane marker data"); - customdata->event_type = event->type; + customdata->launch_event = WM_userdef_event_type_from_keymap_type(event->type); plane_marker = BKE_tracking_plane_marker_ensure(plane_track, framenr); @@ -345,7 +345,7 @@ static int slide_plane_marker_modal(bContext *C, wmOperator *op, const wmEvent * case LEFTMOUSE: case RIGHTMOUSE: - if (event->type == data->event_type && event->val == KM_RELEASE) { + if (event->type == data->launch_event && event->val == KM_RELEASE) { /* Marker is now keyframed. */ data->plane_marker->flag &= ~PLANE_MARKER_TRACKED; |