From cedc90b6077a01a60f589f09a5c82f4b7a359a4b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 26 Nov 2013 00:38:50 +0100 Subject: Fix errors and inconsistencies in confirmation popup removal. * Improve some clip editor messages * Remove popup for metastrips, seems unnecessary * Renamed some variables for consistency * Avoid unnecessary call to CTX_DATA_COUNT Reviewed By: sergey, campbellbarton, aligorith Differential Revision: http://developer.blender.org/D44 --- source/blender/editors/space_clip/clip_graph_ops.c | 4 ++-- source/blender/editors/space_clip/tracking_ops.c | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/space_clip') diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 2a9bc497215..ffb805cdc5f 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -482,7 +482,7 @@ static int delete_curve_exec(bContext *C, wmOperator *op) if (act_track) { clip_delete_track(C, clip, act_track); - BKE_report(op->reports, RPT_INFO, "Deleted all selected curves"); + BKE_report(op->reports, RPT_INFO, "Deleted track"); } return OPERATOR_FINISHED; @@ -492,7 +492,7 @@ void CLIP_OT_graph_delete_curve(wmOperatorType *ot) { /* identifiers */ ot->name = "Delete Curve"; - ot->description = "Delete selected curves"; + ot->description = "Delete track corresponding to the selected curve"; ot->idname = "CLIP_OT_graph_delete_curve"; /* api callbacks */ diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 3e3e8d81d79..b198b68b95a 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -263,8 +263,10 @@ static int delete_track_exec(bContext *C, wmOperator *op) while (track) { next = track->next; - if (TRACK_VIEW_SELECTED(sc, track)) + if (TRACK_VIEW_SELECTED(sc, track)) { clip_delete_track(C, clip, track); + changed = true; + } track = next; } @@ -273,7 +275,7 @@ static int delete_track_exec(bContext *C, wmOperator *op) sc->flag &= ~SC_LOCK_SELECTION; if (changed) { - BKE_report(op->reports, RPT_INFO, "Deleted all selected tracks"); + BKE_report(op->reports, RPT_INFO, "Deleted selected tracks"); WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip); } @@ -307,6 +309,7 @@ static int delete_marker_exec(bContext *C, wmOperator *op) MovieTrackingPlaneTrack *plane_track, *plane_track_next; int framenr = ED_space_clip_get_clip_frame_number(sc); int has_selection = 0; + bool changed = false; while (track) { next = track->next; @@ -318,6 +321,7 @@ static int delete_marker_exec(bContext *C, wmOperator *op) has_selection |= track->markersnr > 1; clip_delete_marker(C, clip, track, marker); + changed = true; } } @@ -341,6 +345,8 @@ static int delete_marker_exec(bContext *C, wmOperator *op) else { BKE_tracking_plane_marker_delete(plane_track, framenr); } + + changed = true; } } } @@ -350,7 +356,10 @@ static int delete_marker_exec(bContext *C, wmOperator *op) sc->flag &= ~SC_LOCK_SELECTION; } - BKE_report(op->reports, RPT_INFO, "Deleted all selected markers"); + if (!changed) + return OPERATOR_CANCELLED; + + BKE_report(op->reports, RPT_INFO, "Deleted markers for current frame from selected tracks"); return OPERATOR_FINISHED; } -- cgit v1.2.3