[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45732] trunk/blender/source/blender/bmesh /tools/BME_bevel.c: remove unneeded check to bevel, BM_vert_is_manifold() already checks all edges are manifold.

Campbell Barton ideasman42 at gmail.com
Wed Apr 18 08:14:51 CEST 2012


Revision: 45732
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45732
Author:   campbellbarton
Date:     2012-04-18 06:14:51 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
remove unneeded check to bevel, BM_vert_is_manifold() already checks all edges are manifold.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/tools/BME_bevel.c

Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-04-18 05:52:18 UTC (rev 45731)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-04-18 06:14:51 UTC (rev 45732)
@@ -148,7 +148,6 @@
  * The drawback, though, is that this code doesn't merge customdata. */
 static int BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v)
 {
-	BMIter iter;
 	BMEdge *e, *elast;
 	BMLoop *l1, *l2;
 
@@ -156,12 +155,6 @@
 		return 0;
 	}
 
-	BM_ITER(e, &iter, bm, BM_EDGES_OF_VERT, v) {
-		if (BM_edge_face_count(e) != 2) {
-			return 0;
-		}
-	}
-
 	if (BM_vert_edge_count(v) > 2) {
 		while (BM_vert_edge_count(v) > 2) {
 			e = v->e;
@@ -1011,12 +1004,14 @@
 		}
 	}
 
+#ifdef DEBUG
 	/* Debug print, remov */
 	BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
 		if (f->len == 2) {
-			printf("warning");
+			printf("%s: warning, 2 edge face\n", __func__);
 		}
 	}
+#endif
 
 	return bm;
 }




More information about the Bf-blender-cvs mailing list