diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-12 14:00:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-12 14:00:15 +0400 |
commit | f87464392c5cc270381d1c8d358abd525df53e9a (patch) | |
tree | bd72c8ccf2bdbd36a93f2cb8216b0c53c1bd2a70 /source/blender/bmesh/operators/bmo_bridge.c | |
parent | 877e0e1184230c320cf61d10873cbf1c0ed31072 (diff) |
bridge option to bridge loop pairs,
change the operator option to an enum: Connect Loops - open/closed/pairs
because it was getting confusing having all as bools.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_bridge.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_bridge.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index bf7c9f86df7..5182ac56f88 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -370,6 +370,7 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op) LinkData *el_store; /* merge-bridge support */ + const bool use_pairs = BMO_slot_bool_get(op->slots_in, "use_pairs"); const bool use_merge = BMO_slot_bool_get(op->slots_in, "use_merge"); const float merge_factor = BMO_slot_float_get(op->slots_in, "merge_factor"); const bool use_cyclic = BMO_slot_bool_get(op->slots_in, "use_cyclic") && (use_merge == false); @@ -389,6 +390,12 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op) goto cleanup; } + if (use_pairs && (count % 2)) { + BMO_error_raise(bm, op, BMERR_INVALID_SELECTION, + "Select an even number of loops to bridge pairs"); + goto cleanup; + } + if (use_merge) { bool match = true; const int eloop_len = BM_edgeloop_length_get(eloops.first); @@ -406,7 +413,7 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op) } if (count > 2) { - BM_mesh_edgeloops_calc_order(bm, &eloops); + BM_mesh_edgeloops_calc_order(bm, &eloops, use_pairs); } for (el_store = eloops.first; el_store; el_store = el_store->next) { @@ -425,6 +432,9 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op) (struct BMEdgeLoopStore *)el_store, (struct BMEdgeLoopStore *)el_store_next, use_merge, merge_factor); + if (use_pairs) { + el_store = el_store->next; + } change = true; } |