[Bf-blender-cvs] [fc8d9030000] blender2.8: Edit Mesh: multi-object split

[Dalai Felinto]

Commit: fc8d9030000aa77dc26b8ff4c442672894e28ffc
Author: Dalai Felinto
Date:   Wed Apr 25 10:58:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfc8d9030000aa77dc26b8ff4c442672894e28ffc

Edit Mesh: multi-object split

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

M       source/blender/editors/mesh/editmesh_tools.c

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

diff --git a/source/blender/editors/mesh/editmesh_tools.c 
b/source/blender/editors/mesh/editmesh_tools.c
index ac32df7a542..8b931c9b711 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -5015,22 +5015,33 @@ void MESH_OT_delete_edgeloop(wmOperatorType *ot)
 
 static int edbm_split_exec(bContext *C, wmOperator *op)
 {
-       Object *ob = CTX_data_edit_object(C);
-       BMEditMesh *em = BKE_editmesh_from_object(ob);
-       BMOperator bmop;
+       ViewLayer *view_layer = CTX_data_view_layer(C);
+       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);
 
-       EDBM_op_init(em, &bmop, op, "split geom=%hvef use_only_faces=%b", 
BM_ELEM_SELECT, false);
-       BMO_op_exec(em->bm, &bmop);
-       BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, 
BM_ELEM_SELECT, false);
-       BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", 
BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
-       if (!EDBM_op_finish(em, &bmop, op, true)) {
-               return OPERATOR_CANCELLED;
-       }
+               if (em->bm->totfacesel == 0) {
+                       continue;
+               }
 
-       /* Geometry has changed, need to recalc normals and looptris */
-       EDBM_mesh_normals_update(em);
+               BMOperator bmop;
+               EDBM_op_init(em, &bmop, op, "split geom=%hvef 
use_only_faces=%b", BM_ELEM_SELECT, false);
+               BMO_op_exec(em->bm, &bmop);
+               BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | 
BM_FACE, BM_ELEM_SELECT, false);
+               BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, 
"geom.out", BM_ALL_NOLOOP, BM_ELEM_SELECT, true);
 
-       EDBM_update_generic(em, true, true);
+               if (!EDBM_op_finish(em, &bmop, op, true)) {
+                       continue;
+               }
+
+               /* Geometry has changed, need to recalc normals and looptris */
+               EDBM_mesh_normals_update(em);
+
+               EDBM_update_generic(em, true, true);
+       }
+       MEM_freeN(objects);
 
        return OPERATOR_FINISHED;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs