blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix for regression in bmesh connect-pair 

T42563 fix wasn't right, fortunately this doesn't fail in most cases.
This commit is contained in:
Campbell Barton 2015-01-10 12:20:17 +11:00
parent 9a0c2c734c
commit 1253a46370
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,19 +464,23 @@ 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
/* get third axis */
normalize_v3(basis_dir);
normalize_v3(basis_nor);
cross_v3_v3v3(basis_tmp, basis_dir, basis_nor);
if (UNLIKELY(normalize_v3(basis_tmp) < FLT_EPSILON)) {
ortho_v3_v3(basis_nor, basis_dir);
normalize_v3(basis_nor);
cross_v3_v3v3(basis_tmp, basis_dir, basis_nor);
normalize_v3(basis_tmp);
}
normalize_v3_v3(pc.matrix[0], basis_tmp);
normalize_v3_v3(pc.matrix[1], basis_dir);
normalize_v3_v3(pc.matrix[2], basis_nor);
copy_v3_v3(pc.matrix[0], basis_tmp);
copy_v3_v3(pc.matrix[1], basis_dir);
copy_v3_v3(pc.matrix[2], basis_nor);
invert_m3(pc.matrix);
pc.axis_sep = dot_m3_v3_row_x(pc.matrix, pc.v_a->co);