blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix T4256: Connect tool hangs

This commit is contained in:
Campbell Barton 2014-11-10 18:38:46 +01:00
parent 3346ab0348
commit 3ead24d235
Notes: blender-bot 2023-02-14 09:50:38 +01:00 
Referenced by issue #42563, Join tool crashes blender in certain case
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/bmesh/operators/bmo_connect_pair.c
View File

@ -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) {