Edit-mesh: multi-object hide

1 files changed, 19 insertions, 4 deletions

diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 00744c25fc0..c64627a5f63 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -1888,13 +1888,28 @@ void MESH_OT_edge_rotate(wmOperatorType *ot)
 
 static int edbm_hide_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
+	const bool unselected = RNA_boolean_get(op->ptr, "unselected");
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	EDBM_mesh_hide(em, RNA_boolean_get(op->ptr, "unselected"));
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMesh *bm = em->bm;
 
-	EDBM_update_generic(em, true, false);
+		if ((bm->totvertsel == 0) &&
+		    (bm->totedgesel == 0) &&
+		    (bm->totfacesel == 0))
+		{
+			continue;
+		}
 
+		EDBM_mesh_hide(em, unselected);
+		EDBM_update_generic(em, true, false);
+	}
+
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }