[Bf-blender-cvs] [750690ae7a5] blender2.8: Object: report number of deleted objects

Campbell Barton noreply at git.blender.org
Tue Nov 20 00:16:26 CET 2018


Commit: 750690ae7a5c5331921dede7e62b095619154c70
Author: Campbell Barton
Date:   Tue Nov 20 09:49:52 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB750690ae7a5c5331921dede7e62b095619154c70

Object: report number of deleted objects

Part of D3953 by @Zachman w/ edits

===================================================================

M	source/blender/editors/object/object_add.c

===================================================================

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);



More information about the Bf-blender-cvs mailing list