[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42784] branches/bmesh/blender/source/ blender: minor formatting edits
Campbell Barton
ideasman42 at gmail.com
Wed Dec 21 05:56:18 CET 2011
Revision: 42784
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42784
Author: campbellbarton
Date: 2011-12-21 04:56:04 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
minor formatting edits
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/editmesh_tools.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.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_to_editmesh.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/intern/editmesh_to_bmesh.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/dissolveops.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/removedoubles.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
Modified: branches/bmesh/blender/source/blender/bmesh/editmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/editmesh_tools.c 2011-12-21 03:33:32 UTC (rev 42783)
+++ branches/bmesh/blender/source/blender/bmesh/editmesh_tools.c 2011-12-21 04:56:04 UTC (rev 42784)
@@ -2356,7 +2356,7 @@
X-------- --------X
*/
- if(v[left]->f1){
+ if(v[left]->f1) {
//triangle is composed of cutvert, end and left
hold = addfacelist(verts[1],v[end],v[left],NULL, NULL,NULL);
hold->e1->f2 |= EDGENEW;
@@ -2374,7 +2374,7 @@
hold->e1->f2 |= EDGEINNER;
facecopy(efa, hold);
}
- else if(v[right]->f1){
+ else if(v[right]->f1) {
//triangle is composed of cutvert, right and start
hold = addfacelist(verts[1],v[right],v[start], NULL, NULL, NULL);
hold->e1->f2 |= EDGENEW;
@@ -2442,7 +2442,7 @@
if(mmd->flag & MOD_MIR_CLIPPING) {
for (eve= em->verts.first; eve; eve= eve->next) {
eve->f2= 0;
- switch(mmd->axis){
+ switch(mmd->axis) {
case 0:
if (fabs(eve->co[0]) < mmd->tolerance)
eve->f2 |= 1;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2011-12-21 03:33:32 UTC (rev 42783)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2011-12-21 04:56:04 UTC (rev 42784)
@@ -109,7 +109,7 @@
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)
@@ -138,8 +138,9 @@
*
*/
-BMFace *BM_Make_Face_QuadTri(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v3,
- BMVert *v4, const BMFace *example, int nodouble)
+BMFace *BM_Make_Face_QuadTri(BMesh *bm,
+ BMVert *v1, BMVert *v2, BMVert *v3, BMVert *v4,
+ const BMFace *example, int nodouble)
{
BMEdge *edar[4];
BMVert *vtar[4];
@@ -172,37 +173,40 @@
edar[0] = edar[1] = edar[2] = edar[3] = NULL;
- if(edges){
+ if(edges) {
edar[0] = edges[0];
edar[1] = edges[1];
edar[2] = edges[2];
if(len == 4) edar[3] = edges[3];
- }else{
+ }
+ else {
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]);
- }else{
+ }
+ else {
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{
+ }
+ else {
overlap = BM_Exist_Face_Overlaps(bm, verts, len, &f);
}
}
/*make new face*/
- if((!f) && (!overlap)){
+ 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(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 {
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c 2011-12-21 03:33:32 UTC (rev 42783)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_eulers.c 2011-12-21 04:56:04 UTC (rev 42784)
@@ -142,12 +142,12 @@
#ifndef bmesh_FASTEULER
/*count valance of v1*/
- if(v1->e){
+ if(v1->e) {
d1 = bmesh_disk_getpointer(v1->e,v1);
if(d1) valance1 = bmesh_cycle_length(d1);
else bmesh_error();
}
- if(v2->e){
+ if(v2->e) {
d2 = bmesh_disk_getpointer(v2->e,v2);
if(d2) valance2 = bmesh_cycle_length(d2);
else bmesh_error();
@@ -225,13 +225,13 @@
diskbase = bmesh_disk_getpointer(v1->e, v1);
len = bmesh_cycle_length(diskbase);
- for(a=0,curedge=v1->e;a<len;a++,curedge = bmesh_disk_nextedge(curedge,v1)){
+ for(a=0,curedge=v1->e;a<len;a++,curedge = bmesh_disk_nextedge(curedge,v1)) {
curedge->head.eflag1 = curedge->head.eflag2 = 0;
}
}
}
- for(i=0;i<len;i++){
+ for(i=0;i<len;i++) {
elist[i]->head.eflag1 |= MF_CANDIDATE;
/*if elist[i] has a loop, count its radial length*/
@@ -243,7 +243,7 @@
Note that this does not gauruntee that face is a single closed loop. At best it gauruntees
that elist contains a finite number of seperate closed loops.
*/
-// for(i=0; i<len; i++){
+// for(i=0; i<len; i++) {
// edok = bmesh_disk_count_edgeflag(elist[i]->v1, MF_CANDIDATE, 0);
// if(edok != 2) return NULL;
// edok = bmesh_disk_count_edgeflag(elist[i]->v2, MF_CANDIDATE, 0);
@@ -255,7 +255,7 @@
tv = v1;
curvert = v2;
- if(bm->vtarlen < len){
+ if(bm->vtarlen < len) {
if (bm->vtar) MEM_freeN(bm->vtar);
bm->vtar = MEM_callocN(sizeof(BMVert *)* len, "BM Vert pointer array");
bm->vtarlen = len;
@@ -271,7 +271,7 @@
edge, loop until we find TV. We know TV is reachable because of test we did earlier.
*/
done=0;
- while(!done){
+ while(!done) {
/*add curvert to vlist*/
/*insert some error cheking here for overflows*/
i++;
@@ -283,7 +283,7 @@
/*find next edge and vert*/
curedge = bmesh_disk_next_edgeflag(curedge, curvert, MF_CANDIDATE, 0);
curvert = bmesh_edge_getothervert(curedge, curvert);
- if(curvert == tv){
+ if(curvert == tv) {
curedge->head.eflag1 |= MF_VISITED;
done=1;
}
@@ -293,17 +293,17 @@
from sv, but that several unconnected loops were passed in via elist.
*/
cont=1;
-// for(i=0; i<len; i++){
+// for(i=0; i<len; i++) {
// if((elist[i]->head.eflag1 & MF_VISITED) == 0) cont = 0;
// }
/*if we get this far, its ok to allocate the face and add the loops*/
- if(cont){
+ if(cont) {
BMLoop *l;
BMEdge *e;
f = bmesh_addpolylist(bm, NULL);
f->len = len;
- for(i=0;i<len;i++){
+ for(i=0;i<len;i++) {
curvert = vlist[i];
l = bmesh_create_loop(bm,curvert,NULL,f,NULL);
if(!(f->loopbase)) f->lbase = l;
@@ -315,10 +315,10 @@
e = NULL;
if(l == f->loopbase) e = elist[0]; /*first edge*/
- else{/*search elist for others*/
- for(j=1; j<len; j++){
+ else {/*search elist for others*/
+ for(j=1; j<len; j++) {
edok = bmesh_verts_in_edge(l->v, ((l->next))->v, elist[j]);
- if(edok){
+ if(edok) {
e = elist[j];
break;
}
@@ -333,7 +333,7 @@
/*Validation Loop cycle*/
edok = bmesh_cycle_validate(len, f->lbase);
if(!edok) bmesh_error();
- for(i=0, l = f->loopbase; i<len; i++, l=((l->next))){
+ for(i=0, l = f->loopbase; i<len; i++, l=((l->next))) {
/*validate loop vert pointers*/
edok = bmesh_verts_in_edge(l->v, ((l->next))->v, l->e);
if(!edok) bmesh_error();
@@ -362,7 +362,7 @@
int bmesh_kv(BMesh *bm, BMVert *v)
{
- if(v->e == NULL){
+ if(v->e == NULL) {
if (BM_TestHFlag(v, BM_SELECT)) bm->totvertsel--;
BLI_remlink(&(bm->verts), &(v->head));
@@ -388,7 +388,7 @@
int edok;
/*Make sure that no faces!*/
- if(e->l == NULL){
+ if(e->l == NULL) {
bmesh_disk_remove_edge(e, e->v1);
bmesh_disk_remove_edge(e, e->v2);
@@ -431,7 +431,7 @@
bmesh_radial_remove_loop(curloop, curloop->e);
/*now deallocate the editloops*/
- for(i=0; i < len; i++){
+ for(i=0; i < len; i++) {
newbase = ((bply->lbase->next));
oldbase = bply->lbase;
bmesh_cycle_remove(oldbase, oldbase);
@@ -506,12 +506,12 @@
if(!edok) bmesh_error();
/*Split the radial cycle if present*/
- if(e->l){
+ if(e->l) {
BMLoop *nl,*l;
BMNode *radEBase=NULL, *radNEBase=NULL;
int radlen = bmesh_cycle_length(&(e->l->radial));
/*Take the next loop. Remove it from radial. Split it. Append to appropriate radials.*/
- while(e->l){
+ while(e->l) {
l=e->l;
l->f->len++;
bmesh_radial_remove_loop(l,e);
@@ -524,18 +524,18 @@
nl->v = nv;
/*assign the correct edge to the correct loop*/
- if(bmesh_verts_in_edge(nl->v, ((nl->next))->v, e)){
+ if(bmesh_verts_in_edge(nl->v, ((nl->next))->v, e)) {
nl->e = e;
l->e = ne;
/*append l into ne's rad cycle*/
- if(!radNEBase){
+ if(!radNEBase) {
radNEBase = &(l->radial);
radNEBase->next = NULL;
radNEBase->prev = NULL;
}
- if(!radEBase){
+ if(!radEBase) {
radEBase = &(nl->radial);
radEBase->next = NULL;
radEBase->prev = NULL;
@@ -545,16 +545,16 @@
bmesh_cycle_append(radNEBase,&(l->radial));
}
- else if(bmesh_verts_in_edge(nl->v,((nl->next))->v,ne)){
+ else if(bmesh_verts_in_edge(nl->v,((nl->next))->v,ne)) {
nl->e = ne;
l->e = e;
- if(!radNEBase){
+ if(!radNEBase) {
radNEBase = &(nl->radial);
radNEBase->next = NULL;
radNEBase->prev = NULL;
}
- if(!radEBase){
+ if(!radEBase) {
radEBase = &(l->radial);
radEBase->next = NULL;
radEBase->prev = NULL;
@@ -575,7 +575,7 @@
if(!edok) bmesh_error();
/*verify loop->v and loop->next->v pointers for e*/
- for(i=0,l=e->l; i < radlen; i++, l = l->radial_next){
+ for(i=0,l=e->l; i < radlen; i++, l = l->radial_next) {
if(!(l->e == e)) bmesh_error();
if(!(l->radial.data == l)) bmesh_error();
if( ((l->prev))->e != ne && ((l->next))->e != ne) bmesh_error();
@@ -588,7 +588,7 @@
if(!edok) bmesh_error();
}
/*verify loop->v and loop->next->v pointers for ne*/
- for(i=0,l=ne->l; i < radlen; i++, l = l->radial_next){
+ for(i=0,l=ne->l; i < radlen; i++, l = l->radial_next) {
if(!(l->e == ne)) bmesh_error();
if(!(l->radial.data == l)) bmesh_error();
if( ((l->prev))->e != e && ((l->next))->e != e) bmesh_error();
@@ -646,7 +646,7 @@
/*verify that v1 and v2 are in face.*/
len = bmesh_cycle_length(f->lbase);
- for(i = 0, curloop = f->loopbase; i < len; i++, curloop = ((curloop->next)) ){
+ for(i = 0, curloop = f->loopbase; i < len; i++, curloop = ((curloop->next)) ) {
if(curloop->v == v1) v1loop = curloop;
else if(curloop->v == v2) v2loop = curloop;
}
@@ -740,14 +740,14 @@
diskbase = bmesh_disk_getpointer(kv->e, kv);
len = bmesh_cycle_length(diskbase);
- if(len == 2){
+ if(len == 2) {
oe = bmesh_disk_nextedge(ke, kv);
tv = bmesh_edge_getothervert(ke, kv);
ov = bmesh_edge_getothervert(oe, kv);
halt = bmesh_verts_in_edge(kv, tv, oe); //check for double edges
if(halt) return 0;
- else{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list