diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-10 20:38:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-10 20:38:46 +0300 |
| commit | 3ead24d2351fb6a39659ff4bd6b978876ded8d5b (patch) | |
| tree | 13e32fe1f81926751b9b7f2c338b1581ed8c77bd | |
| parent | 3346ab034804c0d93e1c20d62e82dff4839b861a (diff) | |
Fix T4256: Connect tool hangs
| -rw-r--r-- | source/blender/bmesh/operators/bmo_connect_pair.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index 916ea3ebcd9..80ed287b4bf 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -464,6 +464,10 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op) negate_v3(basis_nor_b); } add_v3_v3v3(basis_nor, basis_nor_a, basis_nor_b); + + if (UNLIKELY(fabsf(dot_v3v3(basis_nor, basis_dir)) < FLT_EPSILON)) { + ortho_v3_v3(basis_nor, basis_dir); + } } #endif @@ -491,6 +495,9 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op) while (pc.state_lb.first) { PathLinkState *state, *state_next; found_all = true; +#ifdef DEBUG_PRINT + printf("\n%s: stepping %d\n", __func__, BLI_countlist(&pc.state_lb)); +#endif for (state = pc.state_lb.first; state; state = state_next) { state_next = state->next; if (state->link_last->ele == (BMElem *)pc.v_b) { |