archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Multi-Objects: MESH_OT_offset_edge_loops

Browse Source 
Changes from reviewer (Dalai Felinto):
* Code style (replace tabs with spaces).
* Return OPERATOR_CANCELLED if no a single object get through.

Maniphest Tasks: T54643
https://developer.blender.org/D3392
This commit is contained in:
Nick Milios
2018-08-31 17:07:42 -03:00
committed by Dalai Felinto
parent 41759e74de
commit efd843b51c
1 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -6466,37 +6466,50 @@ void MESH_OT_wireframe(wmOperatorType *ot)
static int edbm_offset_edgeloop_exec(bContext *C, wmOperator *op) static int edbm_offset_edgeloop_exec(bContext *C, wmOperator *op)
{ {
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMOperator bmop;
const bool use_cap_endpoint = RNA_boolean_get(op->ptr, "use_cap_endpoint"); const bool use_cap_endpoint = RNA_boolean_get(op->ptr, "use_cap_endpoint");
int ret = OPERATOR_CANCELLED;
EDBM_op_init( ViewLayer *view_layer = CTX_data_view_layer(C);
em, &bmop, op, uint objects_len = 0;
"offset_edgeloops edges=%he use_cap_endpoint=%b", Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
BM_ELEM_SELECT, use_cap_endpoint); for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
Object *obedit = objects[ob_index];
BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMO_op_exec(em->bm, &bmop); if (em->bm->totedgesel == 0) {
continue;
}
BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false); BMOperator bmop;
EDBM_op_init(
em, &bmop, op,
"offset_edgeloops edges=%he use_cap_endpoint=%b",
BM_ELEM_SELECT, use_cap_endpoint);
/* If in face-only select mode, switch to edge select mode so that BMO_op_exec(em->bm, &bmop);
* an edge-only selection is not inconsistent state */
if (em->selectmode == SCE_SELECT_FACE) { BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false);
em->selectmode = SCE_SELECT_EDGE;
EDBM_selectmode_set(em); /* If in face-only select mode, switch to edge select mode so that
EDBM_selectmode_to_scene(C); * an edge-only selection is not inconsistent state */
} if (em->selectmode == SCE_SELECT_FACE) {
em->selectmode = SCE_SELECT_EDGE;
BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true); EDBM_selectmode_set(em);
EDBM_selectmode_to_scene(C);
if (!EDBM_op_finish(em, &bmop, op, true)) { }
return OPERATOR_CANCELLED;
} BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
else {
EDBM_update_generic(em, true, true); if (!EDBM_op_finish(em, &bmop, op, true)) {
return OPERATOR_FINISHED; continue;
}
else {
EDBM_update_generic(em, true, true);
ret = OPERATOR_FINISHED;
}
} }
MEM_freeN(objects);
return ret;
} }
void MESH_OT_offset_edge_loops(wmOperatorType *ot) void MESH_OT_offset_edge_loops(wmOperatorType *ot)