[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46911] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed May 23 00:03:42 CEST 2012
Revision: 46911
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46911
Author: campbellbarton
Date: 2012-05-22 22:03:41 +0000 (Tue, 22 May 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -429,10 +429,10 @@
MFace *mface2 = NULL;
/* calc faces */
- for(i = 0; i < numfaces; i++)
- {
- if(mface[i].v4)
+ for (i = 0; i < numfaces; i++) {
+ if (mface[i].v4) {
quads++;
+ }
}
result = CDDM_from_template(dm, dm->getNumVerts(dm), 0, numfaces + quads, 0, 0);
@@ -443,8 +443,7 @@
DM_ensure_tessface(result);
mface2 = result->getTessFaceArray(result);
- for(i = 0, j = numfaces; i < numfaces; i++)
- {
+ for (i = 0, j = numfaces; i < numfaces; i++) {
// DG TODO: is this necessary?
mface2[i].v1 = mface[i].v1;
mface2[i].v2 = mface[i].v2;
@@ -453,8 +452,7 @@
mface2[i].v4 = 0;
//test_index_face(&mface2[i], &result->faceData, i, 3);
- if(mface[i].v4)
- {
+ if (mface[i].v4) {
DM_copy_tessface_data(dm, result, i, j, 1);
mface2[j].v1 = mface[i].v1;
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -345,19 +345,17 @@
}
}
- if(result)
- {
+ if (result) {
int i = 0;
- for(i = 0; i < 3; i++)
- {
- if(cloth1->verts[collpair->ap1].impulse_count > 0 && ABS(cloth1->verts[collpair->ap1].impulse[i]) < ABS(i1[i]))
+ for (i = 0; i < 3; i++) {
+ if (cloth1->verts[collpair->ap1].impulse_count > 0 && ABS(cloth1->verts[collpair->ap1].impulse[i]) < ABS(i1[i]))
cloth1->verts[collpair->ap1].impulse[i] = i1[i];
- if(cloth1->verts[collpair->ap2].impulse_count > 0 && ABS(cloth1->verts[collpair->ap2].impulse[i]) < ABS(i2[i]))
+ if (cloth1->verts[collpair->ap2].impulse_count > 0 && ABS(cloth1->verts[collpair->ap2].impulse[i]) < ABS(i2[i]))
cloth1->verts[collpair->ap2].impulse[i] = i2[i];
- if(cloth1->verts[collpair->ap3].impulse_count > 0 && ABS(cloth1->verts[collpair->ap3].impulse[i]) < ABS(i3[i]))
+ if (cloth1->verts[collpair->ap3].impulse_count > 0 && ABS(cloth1->verts[collpair->ap3].impulse[i]) < ABS(i3[i]))
cloth1->verts[collpair->ap3].impulse[i] = i3[i];
}
}
@@ -681,8 +679,9 @@
}
}
- if(!result)
+ if (!result) {
break;
+ }
}
return ret;
}
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -997,22 +997,22 @@
MVertSkin *vs = data;
int i;
- for(i = 0; i < count; i++) {
+ for (i = 0; i < count; i++) {
copy_v3_fl(vs[i].radius, 0.25f);
vs[i].flag = 0;
}
}
-
+
static void layerInterp_mvert_skin(void **sources, float *weights,
- float *UNUSED(sub_weights),
- int count, void *dest)
+ float *UNUSED(sub_weights),
+ int count, void *dest)
{
float radius[3], w;
MVertSkin *vs;
int i;
zero_v3(radius);
- for(i = 0; i < count; i++) {
+ for (i = 0; i < count; i++) {
w = weights ? weights[i] : 1.0f;
vs = sources[i];
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -3030,10 +3030,12 @@
ModifierData *md;
for (md = modifiers_getVirtualModifierList(ob); md; md = md->next)
- if(modifier_dependsOnTime(md) &&
- (modifier_isEnabled(scene, md, eModifierMode_Realtime) ||
- modifier_isEnabled(scene, md, eModifierMode_Render)))
+ if (modifier_dependsOnTime(md) &&
+ (modifier_isEnabled(scene, md, eModifierMode_Realtime) ||
+ modifier_isEnabled(scene, md, eModifierMode_Render)))
+ {
return 1;
+ }
return 0;
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -3826,7 +3826,7 @@
layer->data = newdataadr(fd, layer->data);
if (layer->type == CD_MDISPS)
direct_link_mdisps(fd, count, layer->data, layer->flag & CD_FLAG_EXTERNAL);
- else if(layer->type == CD_GRID_PAINT_MASK)
+ else if (layer->type == CD_GRID_PAINT_MASK)
direct_link_grid_paint_mask(fd, count, layer->data);
i++;
}
@@ -7437,7 +7437,7 @@
}
}
- for(cu = main->curve.first; cu; cu = cu->id.next) {
+ for (cu = main->curve.first; cu; cu = cu->id.next) {
if (cu->bevfac2 == 0.0f) {
cu->bevfac1 = 0.0f;
cu->bevfac2 = 1.0f;
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -1662,17 +1662,17 @@
static void write_grid_paint_mask(WriteData *wd, int count, GridPaintMask *grid_paint_mask)
{
- if(grid_paint_mask) {
+ if (grid_paint_mask) {
int i;
writestruct(wd, DATA, "GridPaintMask", count, grid_paint_mask);
- for(i = 0; i < count; ++i) {
+ for (i = 0; i < count; ++i) {
GridPaintMask *gpm = &grid_paint_mask[i];
- if(gpm->data) {
+ if (gpm->data) {
const int gridsize = ccg_gridsize(gpm->level);
writedata(wd, DATA,
- sizeof(*gpm->data) * gridsize * gridsize,
- gpm->data);
+ sizeof(*gpm->data) * gridsize * gridsize,
+ gpm->data);
}
}
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -64,7 +64,7 @@
PaintMaskFloodMode mode,
float value)
{
- switch(mode) {
+ switch (mode) {
case PAINT_MASK_FLOOD_VALUE:
(*elem) = value;
break;
@@ -96,7 +96,7 @@
sculpt_undo_push_begin("Mask flood fill");
- for(i = 0; i < totnode; i++) {
+ for (i = 0; i < totnode; i++) {
PBVHVertexIter vi;
sculpt_undo_push_node(ob, nodes[i], SCULPT_UNDO_MASK);
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -2296,7 +2296,7 @@
/* keep this, saves us from a version patch */
- if(snode->zoom==0.0f) snode->zoom= 1.0f;
+ if (snode->zoom == 0.0f) snode->zoom = 1.0f;
glColor3f(1.0, 1.0, 1.0);
@@ -2337,7 +2337,7 @@
/* keep this, saves us from a version patch */
- if(snode->zoom==0.0f) snode->zoom= 1.0f;
+ if (snode->zoom == 0.0f) snode->zoom = 1.0f;
glColor3f(1.0, 1.0, 1.0);
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -2521,7 +2521,7 @@
/* when linking to group outputs, update the socket type */
/* XXX this should all be part of a generic update system */
if (!link->tonode) {
- if(link->tosock->type != link->fromsock->type)
+ if (link->tosock->type != link->fromsock->type)
nodeSocketSetType(link->tosock, link->fromsock->type);
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -2412,11 +2412,11 @@
if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BM_elem_flag_test(eve, BM_ELEM_SELECT) == data->sel) {
/* skin nodes: draw a red circle around the root
- node(s) */
- if(data->has_vskin) {
+ * node(s) */
+ if (data->has_vskin) {
const MVertSkin *vs = CustomData_bmesh_get(&data->em->bm->vdata,
- eve->head.data,
- CD_MVERT_SKIN);
+ eve->head.data,
+ CD_MVERT_SKIN);
if (vs->flag & MVERT_SKIN_ROOT) {
float radius = (vs->radius[0] + vs->radius[1]) * 0.5f;
bglEnd();
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-05-22 21:16:59 UTC (rev 46910)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-05-22 22:03:41 UTC (rev 46911)
@@ -617,7 +617,7 @@
char axis;
/* Initialize */
- switch(key_type) {
+ switch (key_type) {
case XKEY:
axis = 'X';
constraint_axis = CON_AXIS0;
@@ -1141,9 +1141,11 @@
calculateCenter(t);
- if(cent2d)
+ if (cent2d) {
copy_v2_v2_int(cent2d, t->center2d);
- if(cent3d) {
+ }
+
+ if (cent3d) {
// Copy center from constraint center. Transform center can be local
copy_v3_v3(cent3d, t->con.center);
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-05-22 21:16:59 UTC (rev 46910)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list