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/mask/mask_ops.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/mask') diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index a4943373288..7d7960d2e86 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -1036,19 +1036,17 @@ static int delete_exec(bContext *C, wmOperator *op) } } - if (num_deleted == 0) { + if (num_deleted == 0) return OPERATOR_CANCELLED; - } - else { - /* TODO: only update edited splines */ - BKE_mask_update_display(mask, CFRA); - WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask); + /* TODO: only update edited splines */ + BKE_mask_update_display(mask, CFRA); - BKE_reportf(op->reports, RPT_INFO, "Deleted selected control points from mask '%s'", mask->id.name); + WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask); - return OPERATOR_FINISHED; - } + BKE_reportf(op->reports, RPT_INFO, "Deleted %d control points from mask '%s'", num_deleted, mask->id.name); + + return OPERATOR_FINISHED; } void MASK_OT_delete(wmOperatorType *ot) -- cgit v1.2.3