[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45688] trunk/blender/source/blender: bmesh todo: remove unused code.

Campbell Barton ideasman42 at gmail.com
Mon Apr 16 12:29:59 CEST 2012


Revision: 45688
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45688
Author:   campbellbarton
Date:     2012-04-16 10:29:59 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
bmesh todo: remove unused code.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
    trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
    trunk/blender/source/blender/editors/mesh/editmesh_select.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-04-16 10:22:28 UTC (rev 45687)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-04-16 10:29:59 UTC (rev 45688)
@@ -110,10 +110,9 @@
 		BLI_array_empty(faces);
 		faces = NULL; /* forces different allocatio */
 
-		/* yay, walk */
 		BMW_init(&regwalker, 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(&regwalker, f);

Modified: trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c	2012-04-16 10:22:28 UTC (rev 45687)
+++ trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c	2012-04-16 10:29:59 UTC (rev 45688)
@@ -381,7 +381,7 @@
 
 	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 @@
 
 	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) {

Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c	2012-04-16 10:22:28 UTC (rev 45687)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c	2012-04-16 10:29:59 UTC (rev 45688)
@@ -1221,9 +1221,7 @@
 	/* 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 @@
 	 * 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)));

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-04-16 10:22:28 UTC (rev 45687)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-04-16 10:29:59 UTC (rev 45688)
@@ -2355,11 +2355,6 @@
 		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;
 		}




More information about the Bf-blender-cvs mailing list