[Bf-blender-cvs] [33cc5ed] master: Cleanup: redundant vars
Campbell Barton
noreply at git.blender.org
Sat May 2 22:19:01 CEST 2015
Commit: 33cc5ed49517c170d348d8f35988421402201054
Author: Campbell Barton
Date: Sun May 3 05:20:36 2015 +1000
Branches: master
https://developer.blender.org/rB33cc5ed49517c170d348d8f35988421402201054
Cleanup: redundant vars
===================================================================
M source/blender/bmesh/intern/bmesh_queries.c
M source/blender/editors/mesh/editmesh_rip.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c
index ece4d78..031fc68 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -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;
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c
index cc462bb..e9fc12f 100644
--- a/source/blender/editors/mesh/editmesh_rip.c
+++ b/source/blender/editors/mesh/editmesh_rip.c
@@ -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;
More information about the Bf-blender-cvs
mailing list