Cleanup: redundant vars
authorCampbell Barton <ideasman42@gmail.com>
Sat, 2 May 2015 19:20:36 +0000 (05:20 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 2 May 2015 20:16:59 +0000 (06:16 +1000)
source/blender/bmesh/intern/bmesh_queries.c
source/blender/editors/mesh/editmesh_rip.c

index ece4d782a844bc1225bc796401941d2f63ef84f3..031fc68e66fcf0af6a2b151098d8df94aa9219f1 100644 (file)
@@ -863,7 +863,7 @@ bool BM_vert_is_manifold(const BMVert *v)
 {
        BMEdge *e_iter, *e_first, *e_prev;
        BMLoop *l_iter, *l_first;
-       int edge_num = 0, loop_num = 0, loop_num_region = 0, boundary_num = 0;
+       int loop_num = 0, loop_num_region = 0, boundary_num = 0;
 
        if (v->e == NULL) {
                /* loose vert */
@@ -901,8 +901,6 @@ bool BM_vert_is_manifold(const BMVert *v)
                                return false;
                        }
                }
-
-               edge_num += 1;
        } while ((e_iter = bmesh_disk_edge_next(e_iter, v)) != e_first);
 
        e_first = l_first->e;
index cc462bb75a8ce54d237aadd08ba040122e331932..e9fc12f3252d74b04ecaed39247ed357b259d318 100644 (file)
@@ -570,12 +570,11 @@ static int edbm_rip_invoke__vert(bContext *C, wmOperator *op, const wmEvent *eve
        if (v->e) {
                /* find closest edge to mouse cursor */
                BM_ITER_ELEM (e, &iter, v, BM_EDGES_OF_VERT) {
-                       const bool is_boundary = BM_edge_is_boundary(e);
                        /* consider wire as boundary for this purpose,
                         * otherwise we can't a face away from a wire edge */
-                       totboundary_edge += (is_boundary != 0 || BM_edge_is_wire(e));
+                       totboundary_edge += (BM_edge_is_boundary(e) || BM_edge_is_wire(e));
                        if (!BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
-                               if (is_boundary == false && BM_edge_is_manifold(e)) {
+                               if (BM_edge_is_manifold(e)) {
                                        d = edbm_rip_edgedist_squared(ar, projectMat, e->v1->co, e->v2->co, fmval, INSET_DEFAULT);
                                        if ((e2 == NULL) || (d < dist_sq)) {
                                                dist_sq = d;