[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43912] branches/bmesh/blender/source/ blender: Code Cleanup: style change only
Campbell Barton
ideasman42 at gmail.com
Sun Feb 5 16:55:33 CET 2012
Revision: 43912
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43912
Author: campbellbarton
Date: 2012-02-05 15:55:28 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Code Cleanup: style change only
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators_inline.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_structure.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/primitiveops.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
branches/bmesh/blender/source/blender/bmesh/operators/utils.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-05 14:39:43 UTC (rev 43911)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-05 15:55:28 UTC (rev 43912)
@@ -82,7 +82,7 @@
{
BMVert *v = NULL;
v = bmesh_mv(bm, co);
- if(example)
+ if (example)
CustomData_bmesh_copy_data(&bm->vdata, &bm->vdata, example->head.data, &v->head.data);
return v;
}
@@ -106,13 +106,13 @@
{
BMEdge *e = NULL;
- if(nodouble) /*test if edge already exists.*/
+ if (nodouble) /*test if edge already exists.*/
e = BM_Edge_Exist(v1, v2);
- if(!e) {
+ if (!e) {
e = bmesh_me(bm, v1, v2);
- if(example)
+ if (example)
CustomData_bmesh_copy_data(&bm->edata, &bm->edata, example->head.data, &e->head.data);
}
@@ -155,7 +155,7 @@
edar[0] = BM_Edge_Exist(verts[0], verts[1]);
edar[1] = BM_Edge_Exist(verts[1], verts[2]);
- if(len == 4) {
+ if (len == 4) {
edar[2] = BM_Edge_Exist(verts[2], verts[3]);
edar[3] = BM_Edge_Exist(verts[3], verts[0]);
}
@@ -163,9 +163,9 @@
edar[2] = BM_Edge_Exist(verts[2], verts[0]);
}
- if(nodouble) {
+ if (nodouble) {
/*check if face exists or overlaps*/
- if(len == 4) {
+ if (len == 4) {
overlap = BM_Exist_Face_Overlaps(bm, verts, len, &f);
}
else {
@@ -174,21 +174,22 @@
}
/*make new face*/
- if((!f) && (!overlap)) {
- if(!edar[0]) edar[0] = BM_Make_Edge(bm, verts[0], verts[1], NULL, 0);
- if(!edar[1]) edar[1] = BM_Make_Edge(bm, verts[1], verts[2], NULL, 0);
- if(len == 4) {
- if(!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[3], NULL, 0);
- if(!edar[3]) edar[3] = BM_Make_Edge(bm, verts[3], verts[0], NULL, 0);
- } else {
- if(!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[0], NULL, 0);
+ if ((!f) && (!overlap)) {
+ if (!edar[0]) edar[0] = BM_Make_Edge(bm, verts[0], verts[1], NULL, 0);
+ if (!edar[1]) edar[1] = BM_Make_Edge(bm, verts[1], verts[2], NULL, 0);
+ if (len == 4) {
+ if (!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[3], NULL, 0);
+ if (!edar[3]) edar[3] = BM_Make_Edge(bm, verts[3], verts[0], NULL, 0);
}
+ else {
+ if (!edar[2]) edar[2] = BM_Make_Edge(bm, verts[2], verts[0], NULL, 0);
+ }
f = BM_Make_Face(bm, verts, edar, len, 0);
- if(example && f)
+ if (example && f) {
BM_Copy_Attributes(bm, bm, example, f);
-
+ }
}
return f;
@@ -204,13 +205,14 @@
if (!f) return;
l=BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, f);
- for (; l; l=BMIter_Step(&iter)) {
+ for ( ; l; l=BMIter_Step(&iter)) {
l2 = l->radial_next;
if (l2 && l2 != l) {
if (l2->v == l->v) {
bm_copy_loop_attributes(bm, bm, l2, l);
- } else {
+ }
+ else {
l2 = l2->next;
bm_copy_loop_attributes(bm, bm, l2, l);
}
@@ -371,7 +373,7 @@
BMIter iter;
BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
- if(BMO_TestFlag(bm, f, flag)) BM_Kill_Face(bm, f);
+ if (BMO_TestFlag(bm, f, flag)) BM_Kill_Face(bm, f);
}
}
@@ -381,7 +383,7 @@
BMIter iter;
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
- if(BMO_TestFlag(bm, e, flag)) BM_Kill_Edge(bm, e);
+ if (BMO_TestFlag(bm, e, flag)) BM_Kill_Edge(bm, e);
}
}
@@ -391,7 +393,7 @@
BMIter iter;
BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
- if(BMO_TestFlag(bm, v, flag)) BM_Kill_Vert(bm, v);
+ if (BMO_TestFlag(bm, v, flag)) BM_Kill_Vert(bm, v);
}
}
@@ -441,23 +443,23 @@
const BMHeader *sheader = source;
BMHeader *theader = target;
- if(sheader->htype != theader->htype)
+ if (sheader->htype != theader->htype)
return;
/*First we copy select*/
- if(BM_Selected(source_mesh, source)) BM_Select(target_mesh, target, TRUE);
+ if (BM_Selected(source_mesh, source)) BM_Select(target_mesh, target, TRUE);
/*Now we copy flags*/
theader->hflag = sheader->hflag;
/*Copy specific attributes*/
- if(theader->htype == BM_VERT)
+ if (theader->htype == BM_VERT)
bm_copy_vert_attributes(source_mesh, target_mesh, (const BMVert*)source, (BMVert*)target);
- else if(theader->htype == BM_EDGE)
+ else if (theader->htype == BM_EDGE)
bm_copy_edge_attributes(source_mesh, target_mesh, (const BMEdge*)source, (BMEdge*)target);
- else if(theader->htype == BM_LOOP)
+ else if (theader->htype == BM_LOOP)
bm_copy_loop_attributes(source_mesh, target_mesh, (const BMLoop*)source, (BMLoop*)target);
- else if(theader->htype == BM_FACE)
+ else if (theader->htype == BM_FACE)
bm_copy_face_attributes(source_mesh, target_mesh, (const BMFace*)source, (BMFace*)target);
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-05 14:39:43 UTC (rev 43911)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-05 15:55:28 UTC (rev 43912)
@@ -118,15 +118,15 @@
w[1] = 1.0f - fac;
w[0] = fac;
- if(!e1->l) return;
+ if (!e1->l) return;
l = e1->l;
do {
- if(l->v == v1) {
+ if (l->v == v1) {
v1loop = l;
vloop = v1loop->next;
v2loop = vloop->next;
}
- else if(l->v == v) {
+ else if (l->v == v) {
v1loop = l->next;
vloop = l;
v2loop = l->prev;
@@ -140,7 +140,7 @@
CustomData_bmesh_interp(&bm->ldata, src,w, NULL, 2, vloop->head.data);
l = l->radial_next;
- } while(l!=e1->l);
+ } while (l!=e1->l);
}
void BM_loops_to_corners(BMesh *bm, Mesh *me, int findex,
@@ -155,7 +155,7 @@
MLoopUV *mloopuv;
int i, j;
- for(i=0; i < numTex; i++) {
+ for (i=0; i < numTex; i++) {
texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
texpoly = CustomData_bmesh_get_n(&bm->pdata, f->head.data, CD_MTEXPOLY, i);
@@ -176,7 +176,7 @@
}
- for(i=0; i < numCol; i++) {
+ for (i=0; i < numCol; i++) {
mcol = CustomData_get_n(&me->fdata, CD_MCOL, findex, i);
j = 0;
@@ -265,11 +265,13 @@
lambda= closest_to_line_v3_d(cp,v1, v2, v3);
- if(lambda <= 0.0) {
+ if (lambda <= 0.0) {
VECCOPY(closest, v2);
- } else if(lambda >= 1.0) {
+ }
+ else if (lambda >= 1.0) {
VECCOPY(closest, v3);
- } else {
+ }
+ else {
VECCOPY(closest, cp);
}
}
@@ -316,18 +318,18 @@
rc[0]= v3[0]-v2[0];
rc[1]= v3[1]-v2[1];
len= rc[0]*rc[0]+ rc[1]*rc[1];
- if(len==0.0) {
+ if (len==0.0) {
rc[0]= v1[0]-v2[0];
rc[1]= v1[1]-v2[1];
return sqrt(rc[0]*rc[0]+ rc[1]*rc[1]);
}
labda= (rc[0]*(v1[0]-v2[0]) + rc[1]*(v1[1]-v2[1]))/len;
- if(labda<=0.0) {
+ if (labda<=0.0) {
pt[0]= v2[0];
pt[1]= v2[1];
}
- else if(labda>=1.0) {
+ else if (labda>=1.0) {
pt[0]= v3[0];
pt[1]= v3[1];
}
@@ -359,7 +361,8 @@
}
}
}
- } else {
+ }
+ else {
if (! (line_point_side_v2_d(v2,v3,pt)>=0.0)) {
if (! (line_point_side_v2_d(v3,v4,pt)>=0.0)) {
if (! (line_point_side_v2_d(v4,v1,pt)>=0.0)) {
@@ -436,7 +439,8 @@
f2= fabs(f2);
f1 = MIN2(f1, f2);
CLAMP(f1, 0.0, 1.0+DBL_EPSILON);
- } else {
+ }
+ else {
f1 = -z/(y - 2*z);
CLAMP(f1, 0.0, 1.0+DBL_EPSILON);
@@ -685,7 +689,8 @@
o1 = sides*y + sides-1;
o2 = (sides-1)*sides + y;
- } else {
+ }
+ else {
a1 = sides*y + sides-2;
a2 = sides*y + sides-2;
o1 = sides*y + sides-1;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-02-05 14:39:43 UTC (rev 43911)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-02-05 15:55:28 UTC (rev 43912)
@@ -167,7 +167,7 @@
void bmiter__edge_of_vert_begin(BMIter *iter)
{
init_iterator(iter);
- if(iter->vdata->e) {
+ if (iter->vdata->e) {
iter->firstedge = iter->vdata->e;
iter->nextedge = iter->vdata->e;
}
@@ -177,10 +177,10 @@
{
BMEdge *current = iter->nextedge;
- if(iter->nextedge)
+ if (iter->nextedge)
iter->nextedge = bmesh_disk_nextedge(iter->nextedge, iter->vdata);
- if(iter->nextedge == iter->firstedge) iter->nextedge = NULL;
+ if (iter->nextedge == iter->firstedge) iter->nextedge = NULL;
return current;
}
@@ -194,9 +194,9 @@
{
init_iterator(iter);
iter->count = 0;
- if(iter->vdata->e)
+ if (iter->vdata->e)
iter->count = bmesh_disk_count_facevert(iter->vdata);
- if(iter->count) {
+ if (iter->count) {
iter->firstedge = bmesh_disk_find_first_faceedge(iter->vdata->e, iter->vdata);
iter->nextedge = iter->firstedge;
iter->firstloop = bmesh_radial_find_first_facevert(iter->firstedge->l, iter->vdata);
@@ -207,20 +207,20 @@
{
BMLoop *current = iter->nextloop;
- if(iter->count && iter->nextloop) {
+ if (iter->count && iter->nextloop) {
iter->count--;
iter->nextloop = bmesh_radial_find_next_facevert(iter->nextloop, iter->vdata);
- if(iter->nextloop == iter->firstloop) {
+ if (iter->nextloop == iter->firstloop) {
iter->nextedge = bmesh_disk_find_next_faceedge(iter->nextedge, iter->vdata);
iter->firstloop = bmesh_radial_find_first_facevert(iter->nextedge->l, iter->vdata);
iter->nextloop = iter->firstloop;
}
}
- if(!iter->count) iter->nextloop = NULL;
+ if (!iter->count) iter->nextloop = NULL;
- if(current) return current->f;
+ if (current) return current->f;
return NULL;
}
@@ -234,9 +234,9 @@
{
init_iterator(iter);
iter->count = 0;
- if(iter->vdata->e)
+ if (iter->vdata->e)
iter->count = bmesh_disk_count_facevert(iter->vdata);
- if(iter->count) {
+ if (iter->count) {
iter->firstedge = bmesh_disk_find_first_faceedge(iter->vdata->e, iter->vdata);
iter->nextedge = iter->firstedge;
iter->firstloop = bmesh_radial_find_first_facevert(iter->firstedge->l, iter->vdata);
@@ -247,20 +247,20 @@
{
BMLoop *current = iter->nextloop;
- if(iter->count) {
+ if (iter->count) {
iter->count--;
iter->nextloop = bmesh_radial_find_next_facevert(iter->nextloop, iter->vdata);
- if(iter->nextloop == iter->firstloop) {
+ if (iter->nextloop == iter->firstloop) {
iter->nextedge = bmesh_disk_find_next_faceedge(iter->nextedge, iter->vdata);
iter->firstloop = bmesh_radial_find_first_facevert(iter->nextedge->l, iter->vdata);
iter->nextloop = iter->firstloop;
}
}
- if(!iter->count) iter->nextloop = NULL;
+ if (!iter->count) iter->nextloop = NULL;
- if(current) return current;
+ if (current) return current;
return NULL;
}
@@ -281,13 +281,13 @@
{
BMLoop *current = iter->nextloop;
- if(iter->nextloop)
+ if (iter->nextloop)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list