griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

correct own incorrect check bmesh edgerin subdivide, also add missing break in orthogonalize_m3 though this one wouldn't effect release builds.

Browse Source
This commit is contained in:
Campbell Barton
2013-07-16 11:39:48 +00:00
parent 922320f86e
commit 7430701600
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/intern/math_matrix.c
View File

@@ -836,6 +836,7 @@ void orthogonalize_m3(float mat[3][3], int axis)
normalize_v3(mat[0]);
cross_v3_v3v3(mat[1], mat[2], mat[0]);
}
break;
default:
BLI_assert(0);
}

2
source/blender/bmesh/operators/bmo_bridge.c
View File

@@ -162,7 +162,7 @@ static void bridge_loop_pair(BMesh *bm,
}
if (use_merge) {
BLI_assert((el_store_a_len == el_store_a_len));
BLI_assert((el_store_a_len == el_store_b_len));
}
if (el_store_a_len != el_store_b_len) {

2
source/blender/bmesh/operators/bmo_subdivide_edgering.c
View File

@@ -893,7 +893,7 @@ static void bm_edgering_pair_order(BMesh *bm,
/* before going much further, get ourselves in order
* - align loops (not strictly necessary but handy)
* - ensure winding is set for both loops */
if (BM_edgeloop_is_closed(el_store_a) && BM_edgeloop_is_closed(el_store_a)) {
if (BM_edgeloop_is_closed(el_store_a) && BM_edgeloop_is_closed(el_store_b)) {
BMIter eiter;
BMEdge *e;
BMVert *v_other;