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

Fix error bridging edge loops flipping

Browse Source 
Calculating the winding failed when faces exist on both sides of the edge.
This commit is contained in:
Campbell Barton
2016-05-06 08:51:44 +10:00
parent 37ad451b8e
commit 86abddc96a
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5125,6 +5125,17 @@ static int edbm_bridge_edge_loops_exec(bContext *C, wmOperator *op)
"bridge_loops edges=%he use_pairs=%b use_cyclic=%b use_merge=%b merge_factor=%f twist_offset=%i", "bridge_loops edges=%he use_pairs=%b use_cyclic=%b use_merge=%b merge_factor=%f twist_offset=%i",
edge_hflag, use_pairs, use_cyclic, use_merge, merge_factor, twist_offset); edge_hflag, use_pairs, use_cyclic, use_merge, merge_factor, twist_offset);
if (use_faces && totface_del) {
int i;
BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
for (i = 0; i < totface_del; i++) {
BM_elem_flag_enable(totface_del_arr[i], BM_ELEM_TAG);
}
BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS,
"delete geom=%hf context=%i",
BM_ELEM_TAG, DEL_FACES);
}
BMO_op_exec(em->bm, &bmop); BMO_op_exec(em->bm, &bmop);
if (!BMO_error_occurred(em->bm)) { if (!BMO_error_occurred(em->bm)) {
@@ -5134,17 +5145,6 @@ static int edbm_bridge_edge_loops_exec(bContext *C, wmOperator *op)
BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true); BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
} }
if (use_faces && totface_del) {
int i;
BM_mesh_elem_hflag_disable_all(em->bm, BM_FACE, BM_ELEM_TAG, false);
for (i = 0; i < totface_del; i++) {
BM_elem_flag_enable(totface_del_arr[i], BM_ELEM_TAG);
}
BMO_op_callf(em->bm, BMO_FLAG_DEFAULTS,
"delete geom=%hf context=%i",
BM_ELEM_TAG, DEL_FACES);
}
if (use_merge == false) { if (use_merge == false) {
struct EdgeRingOpSubdProps op_props; struct EdgeRingOpSubdProps op_props;
mesh_operator_edgering_props_get(op, &op_props); mesh_operator_edgering_props_get(op, &op_props);