[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44684] trunk/blender/source/blender/bmesh /operators/bmo_edgesplit.c: bmesh edge split - use a faster method of finding isolated split edges.
Campbell Barton
ideasman42 at gmail.com
Tue Mar 6 21:41:20 CET 2012
Revision: 44684
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44684
Author: campbellbarton
Date: 2012-03-06 20:41:11 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
bmesh edge split - use a faster method of finding isolated split edges.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c
Modified: trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c 2012-03-06 19:50:07 UTC (rev 44683)
+++ trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c 2012-03-06 20:41:11 UTC (rev 44684)
@@ -223,7 +223,7 @@
BMFace *f, *f2;
BMLoop *l, *l2, *l3;
BMLoop *l_next, *l_prev;
- BMEdge *e, *e2;
+ BMEdge *e;
BMVert *v, *v2;
/* face/vert aligned vert array */
@@ -235,24 +235,33 @@
int i, j;
BMO_slot_buffer_flag_enable(bm, op, "edges", EDGE_SEAM, BM_EDGE);
-
- /* single marked edges unconnected to any other marked edges
- * are illegal, go through and unmark them */
- BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) {
- for (i = 0; i < 2; i++) {
- BM_ITER(e2, &iter, bm, BM_EDGES_OF_VERT, i ? e->v2 : e->v1) {
- if (e != e2 && BMO_elem_flag_test(bm, e2, EDGE_SEAM)) {
- break;
- }
+
+ /* untag edges not connected to other tagged edges */
+ {
+ unsigned char *vtouch;
+
+ BM_mesh_elem_index_ensure(bm, BM_VERT);
+
+ vtouch = MEM_callocN(sizeof(char) * bm->totvert, __func__);
+
+ /* single marked edges unconnected to any other marked edges
+ * are illegal, go through and unmark them */
+ BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) {
+ /* lame, but we dont want the count to exceed 255,
+ * so just count to 2, its all we need */
+ unsigned char *c;
+ c = &vtouch[BM_elem_index_get(e->v1)]; if (*c < 2) (*c)++;
+ c = &vtouch[BM_elem_index_get(e->v2)]; if (*c < 2) (*c)++;
+ }
+ BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) {
+ if (vtouch[BM_elem_index_get(e->v1)] == 1 &&
+ vtouch[BM_elem_index_get(e->v2)] == 1)
+ {
+ BMO_elem_flag_disable(bm, e, EDGE_SEAM);
}
- if (e2) {
- break;
- }
}
- if (!e2) {
- BMO_elem_flag_disable(bm, e, EDGE_SEAM);
- }
+ MEM_freeN(vtouch);
}
etags = MEM_callocN(sizeof(EdgeTag) * bm->totedge, "EdgeTag");
More information about the Bf-blender-cvs
mailing list