diff options
-rw-r--r-- | source/blender/bmesh/operators/bmo_dissolve.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 13 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 5 |
4 files changed, 4 insertions, 21 deletions
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index 29796b7dac4..f08b2bffdc6 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -110,10 +110,9 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op) BLI_array_empty(faces); faces = NULL; /* forces different allocatio */ - /* yay, walk */ BMW_init(®walker, bm, BMW_ISLAND, BMW_MASK_NOP, BMW_MASK_NOP, FACE_MARK, - BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ + BMW_FLAG_NOP, /* no need to check BMW_FLAG_TEST_HIDDEN, faces are already marked by the bmo */ BMW_NIL_LAY); f2 = BMW_begin(®walker, f); diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index aad0089b1d7..d126da52b22 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -381,7 +381,7 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op) BMW_init(&walker, bm, BMW_SHELL, BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP, - BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ + BMW_FLAG_NOP, /* no need to use BMW_FLAG_TEST_HIDDEN, already marked data */ BMW_NIL_LAY); BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { @@ -441,7 +441,7 @@ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer) BMW_init(&walker, bm, BMW_LOOPDATA_ISLAND, BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP, - BMW_FLAG_NOP, /* BMESH_TODO - should be BMW_FLAG_TEST_HIDDEN ? */ + BMW_FLAG_NOP, /* no need to use BMW_FLAG_TEST_HIDDEN, already marked data */ layer); BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) { diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 29aab453822..00835b79593 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1221,9 +1221,7 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B /* note, would pass BM_EDGE except we are looping over all edges anyway */ BM_mesh_elem_index_ensure(em->bm, BM_VERT /* | BM_EDGE */); - BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) - { - e->oflags[0].f = 0; /* XXX, whats this for, BMESH_TODO, double check if this is needed */ + BM_ITER(e, &iter, em->bm, BM_EDGES_OF_MESH, NULL) { if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) { BLI_smallhash_insert(&visithash, (uintptr_t)e, NULL); } @@ -1277,15 +1275,6 @@ static int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, B * by the shortest path found so far to the edge. */ -#if 0 /* UNUSED */ /* this block does nothing, not sure why its here? - campbell */ - for (i = 0; i < totvert; i++) { - int start = nedges[i], end = nedges[i + 1], cur; - for (cur = start; cur < end; cur++) { - BMEdge *e = EDBM_edge_at_index(em, edges[cur]); - } - } -#endif - /* regular dijkstra shortest path, but over edges instead of vertices */ heap = BLI_heap_new(); BLI_heap_insert(heap, 0.0f, SET_INT_IN_POINTER(BM_elem_index_get(source))); diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 7a142f3a46e..7e7e3bcfbfe 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -2355,11 +2355,6 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje vmap = EDBM_uv_vert_map_create(em, 0, 0, limit); /* verts are numbered above in make_uv_vert_map_EM, make sure this stays true! */ - /* BMESH_TODO - why keep this commented? - campbell */ -#if 0 - for (a = 0, eve = em->verts.first; eve; a++, eve = eve->next) - eve->tmp.l = a; -#endif if (vmap == NULL) { return; } |