Revision: 44021
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44021
Author: campbellbarton
Date: 2012-02-10 18:09:19 +0000 (Fri, 10 Feb 2012)
Log Message:
-----------
Style Cleanup
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_selecthistory.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/knifetool.c
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
2012-02-10 17:12:44 UTC (rev 44020)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
2012-02-10 18:09:19 UTC (rev 44021)
@@ -101,8 +101,8 @@
#include "RE_shader_ext.h"
#include "LOD_decimation.h"
-/*converts a cddm to a BMEditMesh. if existing is non-NULL, the
- new geometry will be put in there.*/
+/* converts a cddm to a BMEditMesh. if existing is non-NULL, the
+ * new geometry will be put in there.*/
BMEditMesh *CDDM_To_BMesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing,
int do_tesselate)
{
int allocsize[4] = {512, 512, 2048, 512};
@@ -112,8 +112,8 @@
MEdge *me, *medge;
MPoly *mpoly, *mp;
MLoop *mloop, *ml;
- BMVert *v, **vtable, **verts=NULL;
- BMEdge *e, **etable, **edges=NULL;
+ BMVert *v, **vtable, **verts = NULL;
+ BMEdge *e, **etable, **edges = NULL;
BMFace *f;
BMIter liter;
BLI_array_declare(verts);
@@ -140,7 +140,7 @@
/*do verts*/
mv = mvert = dm->dupVertArray(dm);
- for (i=0; i<totvert; i++, mv++) {
+ for (i = 0; i < totvert; i++, mv++) {
v = BM_Make_Vert(bm, mv->co, NULL);
normal_short_to_float_v3(v->no, mv->no);
v->head.hflag = BM_Vert_Flag_From_MEFlag(mv->flag);
@@ -152,7 +152,7 @@
/*do edges*/
me = medge = dm->dupEdgeArray(dm);
- for (i=0; i<totedge; i++, me++) {
+ for (i = 0; i < totedge; i++, me++) {
e = BM_Make_Edge(bm, vtable[me->v1], vtable[me->v2], NULL,
FALSE);
e->head.hflag = BM_Edge_Flag_From_MEFlag(me->flag);
@@ -165,7 +165,7 @@
/*do faces*/
mpoly = mp = dm->getPolyArray(dm);
mloop = dm->getLoopArray(dm);
- for (i=0; i<dm->numPolyData; i++, mp++) {
+ for (i = 0; i < dm->numPolyData; i++, mp++) {
BMLoop *l;
BLI_array_empty(verts);
@@ -192,12 +192,11 @@
l = BMIter_New(&liter, bm, BM_LOOPS_OF_FACE, f);
k = mp->loopstart;
- for (j=0; l; l=BMIter_Step(&liter), k++) {
+ for (j = 0; l; l = BMIter_Step(&liter), k++) {
CustomData_to_bmesh_block(&dm->loopData, &bm->ldata, k,
&l->head.data);
}
- CustomData_to_bmesh_block(&dm->polyData, &bm->pdata,
- i, &f->head.data);
+ CustomData_to_bmesh_block(&dm->polyData, &bm->pdata, i,
&f->head.data);
}
MEM_freeN(vtable);
@@ -217,4 +216,3 @@
return em;
}
-
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
2012-02-10 17:12:44 UTC (rev 44020)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
2012-02-10 18:09:19 UTC (rev 44021)
@@ -296,7 +296,7 @@
/* ok, edges are in correct order, now ensure they are going
* in the correct direction */
- v1found = reverse = 0;
+ v1found = reverse = FALSE;
for (i = 0; i < len; i++) {
if (BM_Vert_In_Edge(edges2[i], v1)) {
/* see if v1 and v2 are in the same edge */
@@ -304,16 +304,16 @@
/* if v1 is shared by the *next* edge, then the
winding
* is incorrect */
if (BM_Vert_In_Edge(edges2[(i + 1) % len], v1))
{
- reverse = 1;
+ reverse = TRUE;
break;
}
}
- v1found = 1;
+ v1found = TRUE;
}
- if (!v1found && BM_Vert_In_Edge(edges2[i], v2)) {
- reverse = 1;
+ if ((v1found == FALSE) && BM_Vert_In_Edge(edges2[i], v2)) {
+ reverse = TRUE;
break;
}
}
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
2012-02-10 17:12:44 UTC (rev 44020)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
2012-02-10 18:09:19 UTC (rev 44021)
@@ -119,7 +119,7 @@
if (!BM_TestHFlag(v1, BM_TMP_TAG) || BM_TestHFlag(v1,
BM_HIDDEN))
continue;
- v2= EDBM_GetMirrorVert(em, v1);
+ v2 = EDBM_GetMirrorVert(em, v1);
if (v2 && !BM_TestHFlag(v2, BM_HIDDEN)) {
BM_Select(em->bm, v2, TRUE);
}
@@ -133,9 +133,9 @@
BMEditMesh *em;
if ((scene->toolsettings->automerge) &&
- (obedit && obedit->type==OB_MESH))
+ (obedit && obedit->type == OB_MESH))
{
- em = ((Mesh*)obedit->data)->edit_btmesh;
+ em = ((Mesh *)obedit->data)->edit_btmesh;
if (!em)
return;
@@ -148,49 +148,49 @@
/* ****************************** SELECTION ROUTINES **************** */
-unsigned int bm_solidoffs=0, bm_wireoffs=0, bm_vertoffs=0; /* set in
drawobject.c ... for colorindices */
+unsigned int bm_solidoffs = 0, bm_wireoffs = 0, bm_vertoffs = 0; /* set
in drawobject.c ... for colorindices */
/* facilities for border select and circle select */
-static char *selbuf= NULL;
+static char *selbuf = NULL;
/* opengl doesn't support concave... */
static void draw_triangulated(int mcords[][2], short tot)
{
- ListBase lb={NULL, NULL};
+ ListBase lb = {NULL, NULL};
DispList *dl;
float *fp;
int a;
/* make displist */
- dl= MEM_callocN(sizeof(DispList), "poly disp");
- dl->type= DL_POLY;
- dl->parts= 1;
- dl->nr= tot;
- dl->verts= fp= MEM_callocN(tot*3*sizeof(float), "poly verts");
+ dl = MEM_callocN(sizeof(DispList), "poly disp");
+ dl->type = DL_POLY;
+ dl->parts = 1;
+ dl->nr = tot;
+ dl->verts = fp = MEM_callocN(tot * 3 * sizeof(float), "poly verts");
BLI_addtail(&lb, dl);
- for(a=0; a<tot; a++, fp+=3) {
- fp[0]= (float)mcords[a][0];
- fp[1]= (float)mcords[a][1];
+ for (a = 0; a < tot; a++, fp += 3) {
+ fp[0] = (float)mcords[a][0];
+ fp[1] = (float)mcords[a][1];
}
/* do the fill */
filldisplist(&lb, &lb, 0);
/* do the draw */
- dl= lb.first; /* filldisplist adds in head of list */
- if (dl->type==DL_INDEX3) {
+ dl = lb.first; /* filldisplist adds in head of list */
+ if (dl->type == DL_INDEX3) {
int *index;
- a= dl->parts;
- fp= dl->verts;
- index= dl->index;
+ a = dl->parts;
+ fp = dl->verts;
+ index = dl->index;
glBegin(GL_TRIANGLES);
- while(a--) {
- glVertex3fv(fp+3*index[0]);
- glVertex3fv(fp+3*index[1]);
- glVertex3fv(fp+3*index[2]);
- index+= 3;
+ while (a--) {
+ glVertex3fv(fp + 3 * index[0]);
+ glVertex3fv(fp + 3 * index[1]);
+ glVertex3fv(fp + 3 * index[2]);
+ index += 3;
}
glEnd();
}
@@ -207,21 +207,23 @@
unsigned int *dr;
int a;
- if (vc->obedit==NULL || vc->v3d->drawtype<OB_SOLID || (vc->v3d->flag &
V3D_ZBUF_SELECT)==0) return 0;
+ if (vc->obedit == NULL || vc->v3d->drawtype < OB_SOLID ||
(vc->v3d->flag & V3D_ZBUF_SELECT) == 0) {
+ return 0;
+ }
- buf= view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
- if (buf==NULL) return 0;
- if (bm_vertoffs==0) return 0;
+ buf = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
+ if (buf == NULL) return 0;
+ if (bm_vertoffs == 0) return 0;
dr = buf->rect;
/* build selection lookup */
- selbuf= MEM_callocN(bm_vertoffs+1, "selbuf");
+ selbuf = MEM_callocN(bm_vertoffs + 1, "selbuf");
- a= (xmax-xmin+1)*(ymax-ymin+1);
- while(a--) {
- if (*dr>0 && *dr<=bm_vertoffs)
- selbuf[*dr]= 1;
+ a = (xmax - xmin + 1) * (ymax-ymin + 1);
+ while (a--) {
+ if (*dr > 0 && *dr <= bm_vertoffs)
+ selbuf[*dr] = 1;
dr++;
}
IMB_freeImBuf(buf);
@@ -230,8 +232,8 @@
int EDBM_check_backbuf(unsigned int index)
{
- if (selbuf==NULL) return 1;
- if (index>0 && index<=bm_vertoffs)
+ if (selbuf == NULL) return 1;
+ if (index > 0 && index <= bm_vertoffs)
return selbuf[index];
return 0;
}
@@ -239,7 +241,7 @@
void EDBM_free_backbuf(void)
{
if (selbuf) MEM_freeN(selbuf);
- selbuf= NULL;
+ selbuf = NULL;
}
/* mcords is a polygon mask
@@ -255,16 +257,18 @@
int a;
/* method in use for face selecting too */
- if (vc->obedit==NULL) {
+ if (vc->obedit == NULL) {
if (paint_facesel_test(vc->obact));
else if (paint_vertsel_test(vc->obact));
else return 0;
}
- else if (vc->v3d->drawtype<OB_SOLID || (vc->v3d->flag &
V3D_ZBUF_SELECT)==0) return 0;
+ else if (vc->v3d->drawtype < OB_SOLID || (vc->v3d->flag &
V3D_ZBUF_SELECT) == 0) {
+ return 0;
+ }
- buf= view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
- if (buf==NULL) return 0;
- if (bm_vertoffs==0) return 0;
+ buf = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
+ if (buf == NULL) return 0;
+ if (bm_vertoffs == 0) return 0;
dr = buf->rect;
@@ -275,31 +279,35 @@
/* yah, opengl doesn't do concave... tsk! */
ED_region_pixelspace(vc->ar);
- draw_triangulated(mcords, tot);
+ draw_triangulated(mcords, tot);
- glBegin(GL_LINE_LOOP); /* for zero sized masks, lines */
- for(a=0; a<tot; a++) glVertex2iv(mcords[a]);
+ glBegin(GL_LINE_LOOP); /* for zero sized masks, lines */
+ for (a = 0; a < tot; a++) {
+ glVertex2iv(mcords[a]);
+ }
glEnd();
glFinish(); /* to be sure readpixels sees mask */
/* grab mask */
- bufmask= view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
+ bufmask = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
drm = bufmask->rect;
- if (bufmask==NULL) return 0; /* only when mem alloc fails, go crash
somewhere else! */
+ if (bufmask == NULL) {
+ return 0; /* only when mem alloc fails, go crash somewhere
else! */
+ }
/* build selection lookup */
- selbuf= MEM_callocN(bm_vertoffs+1, "selbuf");
+ selbuf = MEM_callocN(bm_vertoffs + 1, "selbuf");
- a= (xmax-xmin+1)*(ymax-ymin+1);
- while(a--) {
- if (*dr>0 && *dr<=bm_vertoffs && *drm==0) selbuf[*dr]= 1;
+ a = (xmax - xmin + 1) * (ymax - ymin + 1);
+ while (a--) {
+ if (*dr > 0 && *dr <= bm_vertoffs && *drm == 0) selbuf[*dr] = 1;
dr++; drm++;
}
IMB_freeImBuf(buf);
IMB_freeImBuf(bufmask);
+
return 1;
-
}
/* circle shaped sample area */
@@ -311,28 +319,28 @@
int radsq;
/* method in use for face selecting too */
- if (vc->obedit==NULL) {
+ if (vc->obedit == NULL) {
if (paint_facesel_test(vc->obact));
else if (paint_vertsel_test(vc->obact));
else return 0;
}
- else if (vc->v3d->drawtype<OB_SOLID || (vc->v3d->flag &
V3D_ZBUF_SELECT)==0) return 0;
+ else if (vc->v3d->drawtype < OB_SOLID || (vc->v3d->flag &
V3D_ZBUF_SELECT) == 0) return 0;
- xmin= xs-rads; xmax= xs+rads;
- ymin= ys-rads; ymax= ys+rads;
- buf= view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
- if (bm_vertoffs==0) return 0;
- if (buf==NULL) return 0;
+ xmin = xs - rads; xmax = xs + rads;
+ ymin = ys - rads; ymax = ys + rads;
+ buf = view3d_read_backbuf(vc, xmin, ymin, xmax, ymax);
+ if (bm_vertoffs == 0) return 0;
+ if (buf == NULL) return 0;
dr = buf->rect;
/* build selection lookup */
- selbuf= MEM_callocN(bm_vertoffs+1, "selbuf");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
