[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45056] trunk/blender/source/blender: style cleanup: bmesh
Campbell Barton
ideasman42 at gmail.com
Wed Mar 21 10:10:09 CET 2012
Revision: 45056
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45056
Author: campbellbarton
Date: 2012-03-21 09:10:08 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
style cleanup: bmesh
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/bmesh_operator_api.h
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/mesh/bmesh_utils.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c
Modified: trunk/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/bmesh_operator_api.h 2012-03-21 09:10:08 UTC (rev 45056)
@@ -43,7 +43,7 @@
* when it's executed. tool flags are allocated in layers, one per operator
* execution, and are used for all internal flagging a tool needs to do.
*
- * each operator has a series of "slots," which can be of the following types:
+ * each operator has a series of "slots" which can be of the following types:
* - simple numerical types
* - arrays of elements (e.g. arrays of faces).
* - hash mappings.
@@ -339,7 +339,7 @@
* BMFace *f;
*
* f = BMO_iter_new(&oiter, bm, some_operator, "slotname", BM_FACE);
- * for (; f; f=BMO_iter_step(&oiter)) {
+ * for (; f; f = BMO_iter_step(&oiter)) {
* /do something with the face
* }
*
@@ -349,7 +349,7 @@
* void *val;
*
* key = BMO_iter_new(&oiter, bm, some_operator, "slotname", 0);
- * for (; key; key=BMO_iter_step(&oiter)) {
+ * for (; key; key = BMO_iter_step(&oiter)) {
* val = BMO_iter_map_value(&oiter);
* //do something with the key/val pair
* //note that val is a pointer to the val data,
@@ -389,7 +389,7 @@
#define BMO_ITER(ele, iter, bm, op, slotname, restrict) \
ele = BMO_iter_new(iter, bm, op, slotname, restrict); \
- for ( ; ele; ele=BMO_iter_step(iter))
+ for ( ; ele; ele = BMO_iter_step(iter))
/******************* Inlined Functions********************/
typedef void (*opexec)(BMesh *bm, BMOperator *op);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -76,6 +76,27 @@
BMFace *f = NULL;
int is_overlap = FALSE;
+ /* sanity check - debug mode only */
+ if (len == 3) {
+ BLI_assert(verts[0] != verts[1]);
+ BLI_assert(verts[0] != verts[2]);
+ BLI_assert(verts[1] != verts[2]);
+ }
+ else if (len == 4) {
+ BLI_assert(verts[0] != verts[1]);
+ BLI_assert(verts[0] != verts[2]);
+ BLI_assert(verts[0] != verts[3]);
+
+ BLI_assert(verts[1] != verts[2]);
+ BLI_assert(verts[1] != verts[3]);
+
+ BLI_assert(verts[2] != verts[3]);
+ }
+ else {
+ BLI_assert(0);
+ }
+
+
if (nodouble) {
/* check if face exists or overlaps */
is_overlap = BM_face_exists(bm, verts, len, &f);
@@ -320,14 +341,14 @@
/* get the center point and collect vector array since we loop over these a lot */
zero_v3(cent);
- for (i = 0; i < totv; ++i) {
+ for (i = 0; i < totv; i++) {
madd_v3_v3fl(cent, vert_arr[i]->co, totv_inv);
}
/* find the far point from cent */
far_best = 0.0f;
- for (i = 0; i < totv; ++i) {
+ for (i = 0; i < totv; i++) {
far_dist = len_squared_v3v3(vert_arr[i]->co, cent);
if (far_dist > far_best || far == NULL) {
far = vert_arr[i]->co;
@@ -342,7 +363,7 @@
/* find a point 90deg about to compare with */
far_cross_best = 0.0f;
- for (i = 0; i < totv; ++i) {
+ for (i = 0; i < totv; i++) {
if (far == vert_arr[i]->co) {
continue;
@@ -379,7 +400,7 @@
/* now calcualte every points angle around the normal (signed) */
vang = MEM_mallocN(sizeof(AngleIndexPair) * totv, __func__);
- for (i = 0; i < totv; ++i) {
+ for (i = 0; i < totv; i++) {
float co[3];
float proj_vec[3];
float angle;
@@ -411,13 +432,13 @@
vert_arr_map = MEM_mallocN(sizeof(BMVert **) * totv, __func__);
edge_arr = MEM_mallocN(sizeof(BMEdge **) * totv, __func__);
- for (i = 0; i < totv; ++i) {
+ for (i = 0; i < totv; i++) {
vert_arr_map[i] = vert_arr[vang[i].index];
}
MEM_freeN(vang);
i_prev = totv - 1;
- for (i = 0; i < totv; ++i) {
+ for (i = 0; i < totv; i++) {
edge_arr[i] = BM_edge_create(bm, vert_arr_map[i_prev], vert_arr_map[i], NULL, TRUE);
/* the edge may exist already and be attached to a face
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -374,7 +374,7 @@
/* caller needs to ensure this */
BLI_assert(ototvert > 0);
- vertMap = MEM_callocN(sizeof(*vertMap)*ototvert, "vertMap");
+ vertMap = MEM_callocN(sizeof(*vertMap) * ototvert, "vertMap");
if (CustomData_has_layer(&bm->vdata, CD_SHAPE_KEYINDEX)) {
int *keyi;
BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -429,7 +429,7 @@
/* interpolate the loop data for the loops with v==newv, using orig face */
for (j = 0; j < 2; j++) {
- BMEdge *e_iter = (j==0)? e : newe;
+ BMEdge *e_iter = (j == 0) ? e : newe;
BMLoop *l_iter = e_iter->l;
do {
if (l_iter->v == newv) {
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -466,7 +466,7 @@
copy_v3_v3(cent, v->co);
for (j = 0; j < 3; j++) {
- float fac = (BLI_frand() - 0.5f)*size;
+ float fac = (BLI_frand() - 0.5f) * size;
cent[j] += fac;
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -486,11 +486,12 @@
phi = BMO_slot_float_get(op, "ang") * (float)M_PI / (360.0f * steps);
do_dupli = BMO_slot_bool_get(op, "do_dupli");
+ /* BMESH_TODO - can replace this with BLI_math? */
si = (float)sin(phi);
q[0] = (float)cos(phi);
- q[1] = axis[0]*si;
- q[2] = axis[1]*si;
- q[3] = axis[2]*si;
+ q[1] = axis[0] * si;
+ q[2] = axis[1] * si;
+ q[3] = axis[2] * si;
quat_to_mat3(rmat, q);
BMO_slot_copy(op, op, "geom", "lastout");
Modified: trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_primitive.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/operators/bmo_primitive.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -445,7 +445,7 @@
void bmo_create_monkey_exec(BMesh *bm, BMOperator *op)
{
BMVert *eve;
- BMVert **tv = MEM_mallocN(sizeof(*tv)*monkeynv * 2, "tv");
+ BMVert **tv = MEM_mallocN(sizeof(*tv) * monkeynv * 2, "tv");
float mat[4][4];
int i;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -75,7 +75,7 @@
/* this isn't the best thing in the world. it doesn't handle cases where there's
* multiple faces yet. that might require a convexity test to figure out which
- * face is "best," and who knows what for non-manifold conditions. */
+ * face is "best" and who knows what for non-manifold conditions. */
for (face = BM_iter_new(&iter, bm, BM_FACES_OF_VERT, v1); face; face = BM_iter_step(&iter)) {
for (v = BM_iter_new(&iter2, bm, BM_VERTS_OF_FACE, face); v; v = BM_iter_step(&iter2)) {
if (v == v2) {
@@ -290,7 +290,7 @@
add = 2;
for (i = 0; i < numcuts; i++) {
connect_smallest_face(bm, verts[i], verts[numcuts + add], &nf);
- if (i == numcuts/2) {
+ if (i == numcuts / 2) {
add -= 1;
connect_smallest_face(bm, verts[i], verts[numcuts + add], &nf);
}
@@ -487,8 +487,8 @@
BMO_elem_flag_enable(bm, nf, ELE_INNER);
- v1 = lines[(i + 1)*s] = verts[a];
- v2 = lines[(i + 1)*s + s - 1] = verts[b];
+ v1 = lines[(i + 1) * s] = verts[a];
+ v2 = lines[(i + 1) * s + s - 1] = verts[b];
temp = *e;
for (a = 0; a < numcuts; a++) {
@@ -949,7 +949,7 @@
a = (a + 1) % vlen;
}
- //BM_face_legal_splits(bmesh, face, splits, BLI_array_count(splits)/2);
+ //BM_face_legal_splits(bmesh, face, splits, BLI_array_count(splits) / 2);
for (j = 0; j < BLI_array_count(splits) / 2; j++) {
if (splits[j * 2]) {
Modified: trunk/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_select.c 2012-03-21 09:04:34 UTC (rev 45055)
+++ trunk/blender/source/blender/editors/mesh/bmesh_select.c 2012-03-21 09:10:08 UTC (rev 45056)
@@ -189,7 +189,7 @@
/* build selection lookup */
selbuf = MEM_callocN(bm_vertoffs + 1, "selbuf");
- a = (xmax - xmin + 1) * (ymax-ymin + 1);
+ a = (xmax - xmin + 1) * (ymax - ymin + 1);
while (a--) {
if (*dr > 0 && *dr <= bm_vertoffs)
selbuf[*dr] = 1;
@@ -499,7 +499,7 @@
view3d_validate_backbuf(vc);
- index = view3d_sample_backbuf_rect(vc, vc->mval, 50, bm_solidoffs, bm_wireoffs, &distance,0, NULL, NULL);
+ index = view3d_sample_backbuf_rect(vc, vc->mval, 50, bm_solidoffs, bm_wireoffs, &distance, 0, NULL, NULL);
eed = BM_edge_at_index(vc->em->bm, index - 1);
if (eed && distance < *dist) {
@@ -649,7 +649,7 @@
if (em->selectmode & SCE_SELECT_FACE)
*r_efa = EDBM_findnearestface(vc, &dist);
- dist-= 20; /* since edges select lines, we give dots advantage of 20 pix */
+ dist -= 20; /* since edges select lines, we give dots advantage of 20 pix */
if (em->selectmode & SCE_SELECT_EDGE)
*r_eed = EDBM_findnearestedge(vc, &dist);
@@ -933,7 +933,7 @@
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list