[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45824] trunk/blender/source: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Apr 21 14:51:47 CEST 2012
Revision: 45824
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45824
Author: campbellbarton
Date: 2012-04-21 12:51:47 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_slide.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/renderdatabase.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -2769,7 +2769,7 @@
for (b = 0; b < gattribs->totlayer; b++) {
if (gattribs->layer[b].type == CD_MTFACE) {
/* uv coordinates */
- if(dm->type == DM_TYPE_EDITBMESH) {
+ if (dm->type == DM_TYPE_EDITBMESH) {
/* exception .. */
CustomData *ldata = dm->getLoopDataLayout(dm);
@@ -2806,7 +2806,7 @@
}
}
else if (gattribs->layer[b].type == CD_MCOL) {
- if(dm->type == DM_TYPE_EDITBMESH) {
+ if (dm->type == DM_TYPE_EDITBMESH) {
/* exception .. */
CustomData *ldata = dm->getLoopDataLayout(dm);
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1561,7 +1561,7 @@
}
}
/* To handle repeat, we add 0.1 frame extra to make sure the last frame is included */
- else {
+ else {
/* Mod to repeat */
if (strip->repeat!=1.0f) {
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -635,7 +635,7 @@
p3= pp + s3;
/* note, commented out for follow constraint */
- //if(cu->flag & CU_FOLLOW) {
+ //if (cu->flag & CU_FOLLOW) {
key_curve_tangent_weights(1.0f-fac, data, KEY_BSPLINE);
Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1254,7 +1254,7 @@
madd_v3_v3fl(pa->state.vel, acc, dtime);
- //if(bpa->data.mode != eBoidMode_InAir)
+ //if (bpa->data.mode != eBoidMode_InAir)
bpa->ground = boid_find_ground(bbd, pa, ground_co, ground_nor);
/* change modes, constrain movement & keep track of down vector */
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -700,7 +700,7 @@
GPU_normal_setup( dm );
GPU_uv_setup( dm );
if ( col != NULL ) {
- /*if( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) {
+ /*if ( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) {
col = 0;
}
else if ( mcol && dm->drawObject->colType == CD_MCOL ) {
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1803,7 +1803,7 @@
while (base) {
BLI_remlink(&sce->base,base);
BLI_addhead(&tempbase,base);
- //if(G.debug & G_DEBUG)
+ //if (G.debug & G_DEBUG)
printf("cyclic %s\n", base->object->id.name);
base = sce->base.first;
}
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -3337,7 +3337,7 @@
else if (brush->ray_dir == MOD_DPAINT_RAY_BRUSH_AVG) {
copy_v3_v3(proj_ray, avg_brushNor);
}
- else { /* MOD_DPAINT_RAY_ZPLUS */
+ else { /* MOD_DPAINT_RAY_ZPLUS */
proj_ray[2] = 1.0f;
}
hit.index = -1;
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1320,7 +1320,7 @@
ev = BM_vert_at_index(bmdm->tc->bm, index); /* warning, does list loop, _not_ ideal */
bmvert_to_mvert(bmdm->tc->bm, ev, vert_r);
- if(bmdm->vertexCos)
+ if (bmdm->vertexCos)
copy_v3_v3(vert_r->co, bmdm->vertexCos[index]);
}
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -622,7 +622,7 @@
ret = psys_get_particle_state(&sim, *efd->index, &state, 0);
/* TODO */
- //if(eff->pd->forcefiled == PFIELD_HARMONIC && ret==0) {
+ //if (eff->pd->forcefiled == PFIELD_HARMONIC && ret==0) {
// if (pa->dietime < eff->psys->cfra)
// eff->flag |= PE_VELOCITY_TO_IMPULSE;
//}
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1695,7 +1695,7 @@
*mapindex = index;
}
- else { /* FROM_FACE/FROM_VOLUME */
+ else { /* FROM_FACE/FROM_VOLUME */
if (index >= dm->getNumTessFaces(dm))
return 0;
@@ -1713,7 +1713,7 @@
*mapindex = index_dmcache;
}
- else { /* FROM_FACE/FROM_VOLUME */
+ else { /* FROM_FACE/FROM_VOLUME */
/* find a face on the derived mesh that uses this face */
MFace *mface;
OrigSpaceFace *osface;
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1479,7 +1479,7 @@
if (ctx->index) MEM_freeN(ctx->index);
if (ctx->skip) MEM_freeN(ctx->skip);
if (ctx->seams) MEM_freeN(ctx->seams);
- //if(ctx->vertpart) MEM_freeN(ctx->vertpart);
+ //if (ctx->vertpart) MEM_freeN(ctx->vertpart);
BLI_kdtree_free(ctx->tree);
/* threads */
@@ -4125,7 +4125,7 @@
pa->dietime = sim->scene->r.efra + 1;
pa->lifetime = sim->scene->r.efra;
pa->alive = PARS_ALIVE;
- //if(a<25) fprintf(stderr,"FSPARTICLE debug set %s , a%d = %f,%f,%f , life=%f\n", filename, a, pa->co[0],pa->co[1],pa->co[2], pa->lifetime );
+ //if (a < 25) fprintf(stderr,"FSPARTICLE debug set %s , a%d = %f,%f,%f , life=%f\n", filename, a, pa->co[0],pa->co[1],pa->co[2], pa->lifetime );
}
else {
// skip...
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1352,7 +1352,8 @@
IMB_freeImBuf(ibuf);
}
-struct SeqIndexBuildContext *seq_proxy_rebuild_context(Main *bmain, Scene *scene, Sequence *seq){
+struct SeqIndexBuildContext *seq_proxy_rebuild_context(Main *bmain, Scene *scene, Sequence *seq)
+{
SeqIndexBuildContext *context;
Sequence *nseq;
@@ -3778,7 +3779,7 @@
sound = sound_new_file(CTX_data_main(C), seq_load->path); /* handles relative paths */
if (sound == NULL || sound->playback_handle == NULL) {
- //if(op)
+ //if (op)
// BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
return NULL;
}
@@ -3787,7 +3788,7 @@
if (info.specs.channels == AUD_CHANNELS_INVALID) {
sound_delete(bmain, sound);
- //if(op)
+ //if (op)
// BKE_report(op->reports, RPT_ERROR, "Unsupported audio format");
return NULL;
}
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -1358,7 +1358,7 @@
/*---edges intruding*/
/*+++ close vertices*/
- if (( bf->flag & BFF_INTERSECT)==0) {
+ if (( bf->flag & BFF_INTERSECT)==0) {
bf->flag &= ~BFF_CLOSEVERT;
tune = -1.0f;
feedback[0]=feedback[1]=feedback[2]=0.0f;
@@ -2190,7 +2190,7 @@
}
/* debugerin */
- if (sb->totpoint < ifirst) {
+ if (sb->totpoint < ifirst) {
printf("Aye 998");
return (998);
}
@@ -2960,7 +2960,7 @@
/* the freezer coming sooner or later */
/*
- if ((dot_v3v3(dx,dx)<freezeloc )&&(dot_v3v3(bp->force,bp->force)<freezeforce )) {
+ if ((dot_v3v3(dx,dx)<freezeloc )&&(dot_v3v3(bp->force,bp->force)<freezeforce )) {
bp->frozen /=2;
}
else {
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c 2012-04-21 12:14:07 UTC (rev 45823)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdtree.c 2012-04-21 12:51:47 UTC (rev 45824)
@@ -142,7 +142,7 @@
dist = dot_v3v3(d, d);
- //if(n1 && n2 && (dot_v3v3(n1, n2) < 0.0f))
+ //if (n1 && n2 && (dot_v3v3(n1, n2) < 0.0f))
/* can someone explain why this is done?*/
if (n2 && (dot_v3v3(d, n2) < 0.0f)) {
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list