correct own incorrect check bmesh edgerin subdivide, also add missing break in orthog...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jul 2013 11:39:48 +0000 (11:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jul 2013 11:39:48 +0000 (11:39 +0000)
source/blender/blenlib/intern/math_matrix.c
source/blender/bmesh/operators/bmo_bridge.c
source/blender/bmesh/operators/bmo_subdivide_edgering.c

index 5efa4e4acf35bedc7cdcf726f440f43108452580..cd7dfdc6d2f7d8817c99b48038bf9e8a2565f556 100644 (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);
        }
index 61421b0bec24cc84720b882f58507787e673e20f..5b046524e9537a45052c3547c76cae5f2727f3a9 100644 (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) {
index d9555c409f6e3cf9c3b575675aa19068beb6a198..44d4b63f5c40c51bbb1a8c37193d1a000a842418 100644 (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;