Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-20 01:49:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-20 01:49:52 +0300
commit750690ae7a5c5331921dede7e62b095619154c70 (patch)
tree034e62184219ae992f05757695e15ea208175358 /source/blender/editors/object/object_add.c
parent5f9de429acdb9e4df93f659b4ac8ad118f286f57 (diff)
Object: report number of deleted objects
Part of D3953 by @Zachman w/ edits
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r--source/blender/editors/object/object_add.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index a679674873c..ffb38ab3a7c 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1305,7 +1305,7 @@ static int object_delete_exec(bContext *C, wmOperator *op)
wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win;
const bool use_global = RNA_boolean_get(op->ptr, "use_global");
- bool changed = false;
+ uint changed_count = 0;
if (CTX_data_edit_object(C))
return OPERATOR_CANCELLED;
@@ -1338,7 +1338,7 @@ static int object_delete_exec(bContext *C, wmOperator *op)
if (use_global && ob->id.lib == NULL) {
/* We want to nuke the object, let's nuke it the easy way (not for linked data though)... */
BKE_libblock_delete(bmain, &ob->id);
- changed = true;
+ changed_count += 1;
continue;
}
@@ -1357,7 +1357,7 @@ static int object_delete_exec(bContext *C, wmOperator *op)
/* remove from current scene only */
ED_object_base_free_and_unlink(bmain, scene, ob);
- changed = true;
+ changed_count += 1;
if (use_global) {
Scene *scene_iter;
@@ -1377,8 +1377,11 @@ static int object_delete_exec(bContext *C, wmOperator *op)
}
CTX_DATA_END;
- if (!changed)
+ BKE_reportf(op->reports, RPT_INFO, "Deleted %u object(s)", changed_count);
+
+ if (changed_count == 0) {
return OPERATOR_CANCELLED;
+ }
/* delete has to handle all open scenes */
BKE_main_id_tag_listbase(&bmain->scene, LIB_TAG_DOIT, true);