diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-26 03:38:50 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 20:49:01 +0400 |
commit | cedc90b6077a01a60f589f09a5c82f4b7a359a4b (patch) | |
tree | e6c24bf3fdb0aa2286c744e30ce45b10c8cb0085 /source/blender/editors/object | |
parent | 77719bfd0669cc675ad729f4c51672173842faca (diff) |
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
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_add.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 8496aaaab4c..798bf7c6318 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1057,7 +1057,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win; const short use_global = RNA_boolean_get(op->ptr, "use_global"); - int deleted_num = 0; + int num_deleted = 0; if (CTX_data_edit_object(C)) return OPERATOR_CANCELLED; @@ -1069,7 +1069,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) /* remove from current scene only */ ED_base_object_free_and_unlink(bmain, scene, base); - deleted_num++; + num_deleted++; if (use_global) { Scene *scene_iter; @@ -1104,8 +1104,8 @@ static int object_delete_exec(bContext *C, wmOperator *op) } } - if (deleted_num > 0) - BKE_reportf(op->reports, RPT_INFO, "Deleted %d objects", deleted_num); + if (num_deleted > 0) + BKE_reportf(op->reports, RPT_INFO, "Deleted %d objects", num_deleted); return OPERATOR_FINISHED; } |