[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45017] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Mar 20 05:27:26 CET 2012
Revision: 45017
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45017
Author: campbellbarton
Date: 2012-03-20 04:27:14 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.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_meshdata.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types_select.c
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -220,7 +220,7 @@
float lock_iweight = 1.0f;
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
- if(dw->def_nr != def_nr_lock) {
+ if (dw->def_nr != def_nr_lock) {
tot_weight += dw->weight;
}
else {
@@ -235,7 +235,7 @@
float scalar = (1.0f / tot_weight) * lock_iweight;
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
- if(dw != dw_lock) {
+ if (dw != dw_lock) {
dw->weight *= scalar;
/* in case of division errors with very low weights */
@@ -638,7 +638,7 @@
return;
dw_new = MEM_callocN(sizeof(MDeformWeight) * (dvert->totweight + 1), "defvert_add_to group, new deformWeight");
- if(dvert->dw) {
+ if (dvert->dw) {
memcpy(dw_new, dvert->dw, sizeof(MDeformWeight) * dvert->totweight);
MEM_freeN(dvert->dw);
}
@@ -659,7 +659,7 @@
int i = dw - dvert->dw;
/* Security check! */
- if(i < 0 || i >= dvert->totweight) {
+ if (i < 0 || i >= dvert->totweight) {
return;
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -607,9 +607,9 @@
* we cant make a crossvec from a vec thats the same as the vec
* unlikely but possible, so make sure if the normal is (0, 0, 1)
* that vec isn't the same or in the same direction even. */
- if (eve->no[0] < 0.5f) vec[0] = 1.0f;
- else if (eve->no[1] < 0.5f) vec[1] = 1.0f;
- else vec[2] = 1.0f;
+ if (eve->no[0] < 0.5f) vec[0] = 1.0f;
+ else if (eve->no[1] < 0.5f) vec[1] = 1.0f;
+ else vec[2] = 1.0f;
cross_v3_v3v3(r_plane, eve->no, vec);
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -329,8 +329,8 @@
int count = 0;
BMIter eiter;
BMEdge *edge;
- BM_ITER(edge, &eiter, NULL, BM_EDGES_OF_VERT, v){
- if(edge->l) {
+ BM_ITER(edge, &eiter, NULL, BM_EDGES_OF_VERT, v) {
+ if (edge->l) {
count++;
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -467,7 +467,7 @@
l = BM_face_other_vert_loop(owalk.f_hub, lwalk->lastv, v);
nexte = BM_edge_exists(v, l->v);
- if(!BLI_ghash_haskey(walker->visithash, nexte)){
+ if (!BLI_ghash_haskey(walker->visithash, nexte)) {
lwalk = BMW_state_add(walker);
lwalk->cur = nexte;
lwalk->lastv = v;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -147,7 +147,7 @@
v3 = e->v2;
v4 = e->v1;
}
- /* not sure what to do about example face, pass NULL for now */
+ /* not sure what to do about example face, pass NULL for now */
f = BM_face_create_quad_tri(bm, v1, v2, v3, v4, NULL, FALSE);
if (BMO_elem_flag_test(bm, e, EXT_INPUT))
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -657,7 +657,7 @@
NULL,
};
-#define PLEN (sizeof(patterns) / sizeof(void *))
+#define PLEN (sizeof(patterns) / sizeof(void *))
typedef struct SubDFaceData {
BMVert *start; SubDPattern *pat;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -466,11 +466,11 @@
*/
static float ngon_perimeter(BMesh *bm, BMFace *f)
{
- BMIter liter;
- BMLoop *l;
- int num_verts = 0;
- float v[3], sv[3];
- float perimeter = 0.0f;
+ BMIter liter;
+ BMLoop *l;
+ int num_verts = 0;
+ float v[3], sv[3];
+ float perimeter = 0.0f;
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
if (num_verts == 0) {
@@ -498,11 +498,11 @@
*/
static float ngon_fake_area(BMesh *bm, BMFace *f)
{
- BMIter liter;
- BMLoop *l;
- int num_verts = 0;
- float v[3], sv[3], c[3];
- float area = 0.0f;
+ BMIter liter;
+ BMLoop *l;
+ int num_verts = 0;
+ float v[3], sv[3], c[3];
+ float area = 0.0f;
BM_face_center_mean_calc(bm, f, c);
@@ -528,13 +528,13 @@
* extra face data (computed data)
*/
typedef struct SimSel_FaceExt {
- BMFace *f; /* the face */
- float c[3]; /* center */
+ BMFace *f; /* the face */
+ float c[3]; /* center */
union {
- float area; /* area */
- float perim; /* perimeter */
- float d; /* 4th component of plane (the first three being the normal) */
- struct Image *t; /* image pointer */
+ float area; /* area */
+ float perim; /* perimeter */
+ float d; /* 4th component of plane (the first three being the normal) */
+ struct Image *t; /* image pointer */
};
} SimSel_FaceExt;
@@ -572,7 +572,7 @@
}
/* allocate memory for the selected faces indices and for all temporary faces */
- indices = (int *)MEM_callocN(sizeof(int) * num_sels, "face indices util.c");
+ indices = (int *)MEM_callocN(sizeof(int) * num_sels, "face indices util.c");
f_ext = (SimSel_FaceExt *)MEM_callocN(sizeof(SimSel_FaceExt) * num_total, "f_ext util.c");
/* loop through all the faces and fill the faces/indices structure */
@@ -692,15 +692,15 @@
/**************************************************************************** *
* Similar Edges
**************************************************************************** */
-#define EDGE_MARK 1
+#define EDGE_MARK 1
/*
* compute the angle of an edge (i.e. the angle between two faces)
*/
static float edge_angle(BMesh *bm, BMEdge *e)
{
- BMIter fiter;
- BMFace *f, *f_prev = NULL;
+ BMIter fiter;
+ BMFace *f, *f_prev = NULL;
/* first edge faces, don't account for 3+ */
@@ -719,15 +719,15 @@
* extra edge information
*/
typedef struct SimSel_EdgeExt {
- BMEdge *e;
+ BMEdge *e;
union {
- float dir[3];
- float angle; /* angle between the face */
+ float dir[3];
+ float angle; /* angle between the face */
};
union {
- float length; /* edge length */
- int faces; /* faces count */
+ float length; /* edge length */
+ int faces; /* faces count */
};
} SimSel_EdgeExt;
@@ -738,9 +738,9 @@
void bmo_similaredges_exec(BMesh *bm, BMOperator *op)
{
BMOIter es_iter; /* selected edges iterator */
- BMIter e_iter; /* mesh edges iterator */
- BMEdge *es; /* selected edge */
- BMEdge *e; /* mesh edge */
+ BMIter e_iter; /* mesh edges iterator */
+ BMEdge *es; /* selected edge */
+ BMEdge *e; /* mesh edge */
int idx = 0, i = 0 /* , f = 0 */;
int *indices = NULL;
SimSel_EdgeExt *e_ext = NULL;
@@ -760,7 +760,7 @@
}
/* allocate memory for the selected edges indices and for all temporary edges */
- indices = (int *)MEM_callocN(sizeof(int) * num_sels, "indices util.c");
+ indices = (int *)MEM_callocN(sizeof(int) * num_sels, "indices util.c");
e_ext = (SimSel_EdgeExt *)MEM_callocN(sizeof(SimSel_EdgeExt) * num_total, "e_ext util.c");
/* loop through all the edges and fill the edges/indices structure */
@@ -778,7 +778,7 @@
for (i = 0; i < num_total; i++) {
switch (type) {
case SIMEDGE_LENGTH: /* compute the length of the edge */
- e_ext[i].length = len_v3v3(e_ext[i].e->v1->co, e_ext[i].e->v2->co);
+ e_ext[i].length = len_v3v3(e_ext[i].e->v1->co, e_ext[i].e->v2->co);
break;
case SIMEDGE_DIR: /* compute the direction */
@@ -786,11 +786,11 @@
break;
case SIMEDGE_FACE: /* count the faces around the edge */
- e_ext[i].faces = BM_edge_face_count(e_ext[i].e);
+ e_ext[i].faces = BM_edge_face_count(e_ext[i].e);
break;
case SIMEDGE_FACE_ANGLE:
- e_ext[i].faces = BM_edge_face_count(e_ext[i].e);
+ e_ext[i].faces = BM_edge_face_count(e_ext[i].e);
if (e_ext[i].faces == 2)
e_ext[i].angle = edge_angle(bm, e_ext[i].e);
break;
@@ -924,7 +924,7 @@
}
/* allocate memory for the selected vertices indices and for all temporary vertices */
- indices = (int *)MEM_mallocN(sizeof(int) * num_sels, "vertex indices");
+ indices = (int *)MEM_mallocN(sizeof(int) * num_sels, "vertex indices");
v_ext = (SimSel_VertExt *)MEM_mallocN(sizeof(SimSel_VertExt) * num_total, "vertex extra");
/* loop through all the vertices and fill the vertices/indices structure */
@@ -938,7 +938,7 @@
switch (type) {
case SIMVERT_FACE:
/* calling BM_vert_face_count every time is time consumming, so call it only once per vertex */
- v_ext[i].num_faces = BM_vert_face_count(v);
+ v_ext[i].num_faces = BM_vert_face_count(v);
break;
case SIMVERT_VGROUP:
Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-03-20 04:15:41 UTC (rev 45016)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-03-20 04:27:14 UTC (rev 45017)
@@ -1005,7 +1005,7 @@
if(l2->f->len > 3)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list