[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43938] branches/bmesh/blender/source/ blender/bmesh: Style Cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Feb 7 01:13:39 CET 2012
Revision: 43938
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43938
Author: campbellbarton
Date: 2012-02-07 00:13:29 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Style Cleanup
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.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_walkers.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.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/subdivideop.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -317,14 +317,14 @@
rc[0] = v3[0] - v2[0];
rc[1] = v3[1] - v2[1];
- len = rc[0]*rc[0]+ rc[1]*rc[1];
+ len = rc[0] * rc[0] + rc[1] * rc[1];
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;
+ labda = (rc[0] * (v1[0] - v2[0]) + rc[1] * (v1[1] - v2[1])) / len;
if (labda <= 0.0) {
pt[0] = v2[0];
pt[1] = v2[1];
@@ -334,20 +334,20 @@
pt[1] = v3[1];
}
else {
- pt[0] = labda*rc[0]+v2[0];
- pt[1] = labda*rc[1]+v2[1];
+ pt[0] = labda * rc[0] + v2[0];
+ pt[1] = labda * rc[1] + v2[1];
}
- rc[0] = pt[0]-v1[0];
- rc[1] = pt[1]-v1[1];
- return sqrt(rc[0]*rc[0]+ rc[1]*rc[1]);
+ rc[0] = pt[0] - v1[0];
+ rc[1] = pt[1] - v1[1];
+ return sqrt(rc[0] * rc[0] + rc[1] * rc[1]);
}
MINLINE double line_point_side_v2_d(const double *l1, const double *l2, const double *pt)
{
- return ((l1[0]-pt[0]) * (l2[1]-pt[1])) -
- ((l2[0]-pt[0]) * (l1[1]-pt[1]));
+ return ((l1[0] - pt[0]) * (l2[1] - pt[1])) -
+ ((l2[0] - pt[0]) * (l1[1] - pt[1]));
}
/* point in quad - only convex quads */
@@ -650,10 +650,10 @@
sides = (int)sqrt(mdp->totdisp);
for (y = 0; y < sides; y++) {
- add_v3_v3v3(co1, mdn->disps[y*sides], mdl->disps[y]);
+ add_v3_v3v3(co1, mdn->disps[y * sides], mdl->disps[y]);
mul_v3_fl(co1, 0.5);
- copy_v3_v3(mdn->disps[y*sides], co1);
+ copy_v3_v3(mdn->disps[y * sides], co1);
copy_v3_v3(mdl->disps[y], co1);
}
}
@@ -692,8 +692,8 @@
int a1, a2, o1, o2;
if (l->v != l->radial_next->v) {
- a1 = sides*y + sides-2;
- a2 = (sides-2)*sides + y;
+ a1 = sides * y + sides - 2;
+ a2 = (sides - 2) * sides + y;
o1 = sides * y + sides - 1;
o2 = (sides - 1) * sides + y;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -62,7 +62,7 @@
int *tots[3];
int i;
- /* recount tot*sel variables */
+ /* recount (tot * sel) variables */
bm->totvertsel = bm->totedgesel = bm->totfacesel = 0;
tots[0] = &bm->totvertsel;
tots[1] = &bm->totedgesel;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -410,7 +410,7 @@
* @returns The New Edge
*/
-BMEdge* BM_Collapse_Vert_Faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, const int join_faces)
+BMEdge *BM_Collapse_Vert_Faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, const int join_faces)
{
BMEdge *ne = NULL;
BMVert *tv = bmesh_edge_getothervert(ke, kv);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -523,7 +523,7 @@
void BM_Kill_Face_Verts(BMesh *bm, BMFace *f)
{
- BMVert**verts = NULL;
+ BMVert **verts = NULL;
BLI_array_staticdeclare(verts, BM_NGON_STACK_SIZE);
BMLoop *l_iter;
BMLoop *l_first;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -1216,7 +1216,7 @@
def = opdefines[i];
i = 0;
- state = 1; //0: not inside slotcode name, 1: inside slotcode name
+ state = 1; /* 0: not inside slotcode name, 1: inside slotcode name */
while (*fmt) {
if (state) {
@@ -1336,7 +1336,7 @@
default:
fprintf(stderr,
"%s: unrecognized bmop format char: %c, %d in '%s'\n",
- __func__, *fmt, (int)(fmt-ofmt), ofmt);
+ __func__, *fmt, (int)(fmt - ofmt), ofmt);
break;
}
}
@@ -1350,7 +1350,7 @@
/* non urgent todo - explain exactly what is failing */
fprintf(stderr,
"%s: error parsing formatting string, %d in '%s'\n see - %s:%d\n",
- __func__, (int)(fmt-ofmt), _fmt, __FILE__, lineno);
+ __func__, (int)(fmt - ofmt), _fmt, __FILE__, lineno);
MEM_freeN(ofmt);
BMO_Finish_Op(bm, op);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -60,13 +60,15 @@
static short testedgeside(const double v1[2], const double v2[2], const double v3[2])
{
- /* is v3 to the right of v1-v2 ? With exception: v3 == v1 || v3 == v2 */
+ /* is v3 to the right of v1 - v2 ? With exception: v3 == v1 || v3 == v2 */
double inp;
//inp = (v2[cox] - v1[cox]) * (v1[coy] - v3[coy]) + (v1[coy] - v2[coy]) * (v1[cox] - v3[cox]);
- inp = (v2[0]-v1[0]) * (v1[1]-v3[1]) + (v1[1] - v2[1]) * (v1[0] - v3[0]);
+ inp = (v2[0] - v1[0]) * (v1[1] - v3[1]) + (v1[1] - v2[1]) * (v1[0] - v3[0]);
- if (inp < 0.0) return 0;
+ if (inp < 0.0) {
+ return 0;
+ }
else if (inp == 0) {
if (v1[0] == v3[0] && v1[1] == v3[1]) return 0;
if (v2[0] == v3[0] && v2[1] == v3[1]) return 0;
@@ -76,10 +78,10 @@
static short testedgesidef(const float v1[2], const float v2[2], const float v3[2])
{
- /* is v3 to the right of v1-v2 ? With exception: v3 == v1 || v3 == v2 */
+ /* is v3 to the right of v1 - v2 ? With exception: v3 == v1 || v3 == v2 */
double inp;
- //inp = (v2[cox]-v1[cox])*(v1[coy]-v3[coy]) + (v1[coy]-v2[coy])*(v1[cox]-v3[cox]);
+ //inp = (v2[cox] - v1[cox]) * (v1[coy] - v3[coy]) + (v1[coy] - v2[coy]) * (v1[cox] - v3[cox]);
inp = (v2[0] - v1[0]) * (v1[1] - v3[1]) + (v1[1] - v2[1]) * (v1[0] - v3[0]);
if (inp < 0.0) {
@@ -662,15 +664,17 @@
/* do an interval test on the x and y axe */
/* first do x axi */
#define T FLT_EPSILON * 15
- if (ABS(v1[1]-v2[1]) < T && ABS(v3[1]-v4[1]) < T &&
- ABS(v1[1]-v3[1]) < T)
+ if ( ABS(v1[1] - v2[1]) < T &&
+ ABS(v3[1] - v4[1]) < T &&
+ ABS(v1[1] - v3[1]) < T)
{
return (mv4[0] >= mv1[0] && mv3[0] <= mv2[0]);
}
/* now do y axi */
- if (ABS(v1[0]-v2[0]) < T && ABS(v3[0]-v4[0]) < T &&
- ABS(v1[0]-v3[0]) < T)
+ if ( ABS(v1[0] - v2[0]) < T &&
+ ABS(v3[0] - v4[0]) < T &&
+ ABS(v1[0] - v3[0]) < T)
{
return (mv4[1] >= mv1[1] && mv3[1] <= mv2[1]);
}
@@ -809,15 +813,18 @@
}
if (isear) {
- /* angle = angle_v3v3v3(verts[v1->head.eflag2], verts[v2->head.eflag2], verts[v3->head.eflag2]);
+#if 0
+ angle = angle_v3v3v3(verts[v1->head.eflag2], verts[v2->head.eflag2], verts[v3->head.eflag2]);
if (!bestear || ABS(angle-45.0f) < bestangle) {
bestear = l;
- bestangle = ABS(45.0f-angle);
+ bestangle = ABS(45.0f - angle);
}
if (angle > 20 && angle < 90) break;
if (angle < 100 && i > 5) break;
- i += 1; */
+ i += 1;
+#endif
+
bestear = l_iter;
break;
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -193,7 +193,7 @@
* worklist for processing.
*/
-void* BMW_currentstate(BMWalker *walker)
+void *BMW_currentstate(BMWalker *walker)
{
bmesh_walkerGeneric *currentstate = walker->states.first;
if (currentstate) {
@@ -237,7 +237,7 @@
* breadth-first walks.
*/
-void* BMW_addstate(BMWalker *walker)
+void *BMW_addstate(BMWalker *walker)
{
bmesh_walkerGeneric *newstate;
newstate = BLI_mempool_alloc(walker->worklist);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/createops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/operators/createops.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -181,7 +181,7 @@
totedge = BLI_array_count(edges);
for (i = 0; i < totedge / 2; i++) {
- SWAP(BMEdge*, edges[i], edges[totedge - 1 - i]);
+ SWAP(BMEdge *, edges[i], edges[totedge - 1 - i]);
}
vdata[BM_GetIndex(v)].e = NULL;
@@ -535,11 +535,11 @@
}
if (dot_v3v3(n1, n2) < 0.0f) {
if (dot_v3v3(n1, n3) >= 0.0f + FLT_EPSILON * 10) {
- SWAP(BMEdge*, edges[i], edges[(i + 1) % totedge]);
+ SWAP(BMEdge *, edges[i], edges[(i + 1) % totedge]);
}
else {
- SWAP(BMEdge*, edges[(i + totedge - 1) % totedge], edges[(i + 1) % totedge])
- SWAP(BMEdge*, edges[i], edges[(i + 1) % totedge])
+ SWAP(BMEdge *, edges[(i + totedge - 1) % totedge], edges[(i + 1) % totedge])
+ SWAP(BMEdge *, edges[i], edges[(i + 1) % totedge])
}
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2012-02-06 23:48:42 UTC (rev 43937)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c 2012-02-07 00:13:29 UTC (rev 43938)
@@ -469,16 +469,16 @@
/* new Vertex block */
if (bm->totvert == 0) mvert = NULL;
- else mvert = MEM_callocN(bm->totvert*sizeof(MVert), "loadeditbMesh vert");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list