[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44576] trunk/blender/source/blender/bmesh : style cleanup: bmesh - have continue on new line, also avoid unneeded loop in bmo_extrude_face_region_exec() in some cases.
Campbell Barton
ideasman42 at gmail.com
Thu Mar 1 14:13:18 CET 2012
Revision: 44576
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44576
Author: campbellbarton
Date: 2012-03-01 13:13:08 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
style cleanup: bmesh - have continue on new line, also avoid unneeded loop in bmo_extrude_face_region_exec() in some cases.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_connect.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -944,8 +944,10 @@
#ifdef USE_BMESH_HOLES
for (lst = f->loops.first; lst; lst = lst->next) {
- if (lst == f->loops.first) continue;
-
+ if (lst == f->loops.first) {
+ continue;
+ }
+
BLI_remlink(&f->loops, lst);
BLI_addtail(&holes, lst);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -959,7 +959,9 @@
shrink_edgef(v1, v2, fac1);
for (j = 0; j < len; j++) {
- if (!loops[j][0]) continue;
+ if (!loops[j][0]) {
+ continue;
+ }
p3 = edgeverts[j * 2];
p4 = edgeverts[j * 2 + 1];
@@ -972,22 +974,20 @@
for (i = 0; i < len; i++) {
for (j = 0; j < len; j++) {
- if (j == i) continue;
- if (!loops[i][0]) continue;
- if (!loops[j][0]) continue;
+ if (j != i && loops[i][0] && loops[j][0]) {
+ p1 = edgeverts[i * 2];
+ p2 = edgeverts[i * 2 + 1];
+ p3 = edgeverts[j * 2];
+ p4 = edgeverts[j * 2 + 1];
- p1 = edgeverts[i * 2];
- p2 = edgeverts[i * 2 + 1];
- p3 = edgeverts[j * 2];
- p4 = edgeverts[j * 2 + 1];
+ copy_v3_v3(v1, p1);
+ copy_v3_v3(v2, p2);
- copy_v3_v3(v1, p1);
- copy_v3_v3(v2, p2);
+ shrink_edgef(v1, v2, fac1);
- shrink_edgef(v1, v2, fac1);
-
- if (linecrossesf(v1, v2, p3, p4)) {
- loops[i][0] = NULL;
+ if (linecrossesf(v1, v2, p3, p4)) {
+ loops[i][0] = NULL;
+ }
}
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -360,7 +360,10 @@
if (walker->mask_face && !BMO_elem_flag_test(walker->bm, f, walker->mask_face)) {
continue;
}
- if (BLI_ghash_haskey(walker->visithash, f)) continue;
+
+ if (BLI_ghash_haskey(walker->visithash, f)) {
+ continue;
+ }
iwalk = BMW_state_add(walker);
iwalk->cur = f;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -51,7 +51,9 @@
BLI_array_empty(loops);
BLI_array_empty(verts);
- if (BMO_elem_flag_test(bm, f, FACE_NEW)) continue;
+ if (BMO_elem_flag_test(bm, f, FACE_NEW)) {
+ continue;
+ }
l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
lastl = NULL;
@@ -74,7 +76,9 @@
}
}
- if (BLI_array_count(loops) == 0) continue;
+ if (BLI_array_count(loops) == 0) {
+ continue;
+ }
if (BLI_array_count(loops) > 2) {
BLI_array_growone(loops);
@@ -87,7 +91,9 @@
BM_face_legal_splits(bm, f, (BMLoop *(*)[2])loops, BLI_array_count(loops) / 2);
for (i = 0; i < BLI_array_count(loops) / 2; i++) {
- if (loops[i * 2] == NULL) continue;
+ if (loops[i * 2] == NULL) {
+ continue;
+ }
BLI_array_growone(verts);
verts[BLI_array_count(verts) - 1] = loops[i * 2]->v;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -96,8 +96,11 @@
/* collect region */
BMO_ITER(f, &oiter, bm, op, "faces", BM_FACE) {
- if (!BMO_elem_flag_test(bm, f, FACE_MARK)) continue;
+ if (!BMO_elem_flag_test(bm, f, FACE_MARK)) {
+ continue;
+ }
+
BLI_array_empty(faces);
faces = NULL; /* forces different allocatio */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -203,19 +203,22 @@
* original geometry unless caller explicitly asked to keep it. */
if (!BMO_slot_bool_get(op, "alwayskeeporig")) {
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
- if (!BMO_elem_flag_test(bm, e, EXT_INPUT)) continue;
- found = 0;
+ if (!BMO_elem_flag_test(bm, e, EXT_INPUT)) {
+ continue;
+ }
+
+ found = FALSE;
f = BM_iter_new(&fiter, bm, BM_FACES_OF_EDGE, e);
for (rlen = 0; f; f = BM_iter_step(&fiter), rlen++) {
if (!BMO_elem_flag_test(bm, f, EXT_INPUT)) {
- found = 1;
+ found = TRUE;
delorig = 1;
break;
}
}
- if (!found && (rlen > 1)) {
+ if ((found == FALSE) && (rlen > 1)) {
BMO_elem_flag_enable(bm, e, EXT_DEL);
}
}
@@ -223,23 +226,26 @@
/* calculate verts to delet */
BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
- found = 0;
+ found = FALSE;
BM_ITER(e, &viter, bm, BM_EDGES_OF_VERT, v) {
if (!BMO_elem_flag_test(bm, e, EXT_INPUT) || !BMO_elem_flag_test(bm, e, EXT_DEL)) {
- found = 1;
+ found = TRUE;
break;
}
}
-
- BM_ITER(f, &viter, bm, BM_FACES_OF_VERT, v) {
- if (!BMO_elem_flag_test(bm, f, EXT_INPUT)) {
- found = 1;
- break;
+
+ /* avoid an extra loop */
+ if (found == TRUE) {
+ BM_ITER(f, &viter, bm, BM_FACES_OF_VERT, v) {
+ if (!BMO_elem_flag_test(bm, f, EXT_INPUT)) {
+ found = TRUE;
+ break;
+ }
}
}
- if (!found) {
+ if (found == FALSE) {
BMO_elem_flag_enable(bm, v, EXT_DEL);
}
}
@@ -275,12 +281,16 @@
BMO_slot_copy(&dupeop, op, "newout", "geomout");
e = BMO_iter_new(&siter, bm, &dupeop, "boundarymap", 0);
for ( ; e; e = BMO_iter_step(&siter)) {
- if (BMO_slot_map_contains(bm, op, "exclude", e)) continue;
+ if (BMO_slot_map_contains(bm, op, "exclude", e)) {
+ continue;
+ }
- newedge = BMO_iter_map_value(&siter);
- newedge = *(BMEdge **)newedge;
- if (!newedge) continue;
+ newedge = *(BMEdge **)BMO_iter_map_value(&siter);
+ if (!newedge) {
+ continue;
+ }
+
/* orient loop to give same normal as a loop of newedge
* if it exists (will be an extruded face),
* else same normal as a loop of e, if it exists */
@@ -309,7 +319,11 @@
/* copy attribute */
l = BM_iter_new(&iter, bm, BM_LOOPS_OF_FACE, f);
for ( ; l; l = BM_iter_step(&iter)) {
- if (l->e != e && l->e != newedge) continue;
+
+ if (l->e != e && l->e != newedge) {
+ continue;
+ }
+
l2 = l->radial_next;
if (l2 == l) {
@@ -349,7 +363,7 @@
BM_edge_create(bm, v, v2, v->e, TRUE);
}
- /* cleanu */
+ /* cleanup */
if (delorig) BMO_op_finish(bm, &delop);
BMO_op_finish(bm, &dupeop);
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -510,8 +510,10 @@
len = BLI_array_count(verts);
for (i = 0; i < len; i++) {
v = verts[i];
- if (BMO_elem_flag_test(bm, v, VERT_DOUBLE)) continue;
-
+ if (BMO_elem_flag_test(bm, v, VERT_DOUBLE)) {
+ continue;
+ }
+
for (j = i + 1; j < len; j++) {
v2 = verts[j];
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-01 12:20:18 UTC (rev 44575)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-01 13:13:08 UTC (rev 44576)
@@ -837,7 +837,9 @@
for (i = 0; i < PLEN; i++) {
pat = patterns[i];
- if (!pat) continue;
+ if (!pat) {
+ continue;
+ }
if (pat->len == face->len) {
for (a = 0; a < pat->len; a++) {
More information about the Bf-blender-cvs
mailing list