[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46455] trunk/blender/source/blender: style cleanup: whitespace/operators
Campbell Barton
ideasman42 at gmail.com
Wed May 9 11:24:15 CEST 2012
Revision: 46455
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46455
Author: campbellbarton
Date: 2012-05-09 09:24:15 +0000 (Wed, 09 May 2012)
Log Message:
-----------
style cleanup: whitespace/operators
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/space_file/fsmenu.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/render/intern/source/gammaCorrectionTables.c
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/avi/intern/avi.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -966,8 +966,7 @@
temp = (AviIndexEntry *) MEM_mallocN((frame_num + 1) *
(movie->header->Streams + 1) * sizeof(AviIndexEntry), "newidxentry");
if (movie->entries != NULL) {
- memcpy(temp, movie->entries, movie->index_entries * (movie->header->Streams + 1)
- * sizeof(AviIndexEntry));
+ memcpy(temp, movie->entries, movie->index_entries * (movie->header->Streams + 1) * sizeof(AviIndexEntry));
MEM_freeN(movie->entries);
}
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -2666,7 +2666,7 @@
if (is_degenerate == 0) {
copy_v2_v2(prev_edge, cur_edge);
- ++i;
+ i++;
}
}
}
@@ -2725,7 +2725,7 @@
f2x_surf_area = len_v3(norm);
fsurf_ratio = f2x_surf_area/f2x_area_uv; // tri area divided by texture area
- ++nr_accumulated;
+ nr_accumulated++;
dsum += (double)(fsurf_ratio);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -1915,8 +1915,7 @@
void *src_data = source->layers[src_i].data;
for (j = 0; j < count; ++j)
- sources[j] = (char *)src_data
- + typeInfo->size * src_indices[j];
+ sources[j] = (char *)src_data + typeInfo->size * src_indices[j];
dest_offset = dest_index * typeInfo->size;
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -96,8 +96,7 @@
BLI_strncpy(md->name, mti->name, sizeof(md->name));
md->type = type;
- md->mode = eModifierMode_Realtime
- | eModifierMode_Render | eModifierMode_Expanded;
+ md->mode = eModifierMode_Realtime | eModifierMode_Render | eModifierMode_Expanded;
if (mti->flags & eModifierTypeFlag_EnableInEditmode)
md->mode |= eModifierMode_Editmode;
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -476,9 +476,9 @@
if (md->totdisp == lvl_totdisp)
break;
else if (md->totdisp < lvl_totdisp)
- --totlvl;
+ totlvl--;
else
- ++totlvl;
+ totlvl++;
}
@@ -764,7 +764,7 @@
int vndx = me->mloop[p->loopstart + k].v;
if (vndx != i) {
add_v3_v3(center, origco[vndx]);
- ++tot;
+ tot++;
}
}
}
@@ -1755,7 +1755,7 @@
/* Load base verts */
for (i = 0; i < lvl1->totvert; ++i) {
vvmap[totvert - lvl1->totvert + i] = src;
- ++src;
+ src++;
}
/* Original edges */
@@ -1801,7 +1801,7 @@
int sides = lvl1->faces[i].v[3] ? 4 : 3;
lvl = lvl1->next->next;
- ++dst;
+ dst++;
for (j = 3; j <= mr->level_count; ++j) {
int base = multires_side_tot[totlvl - j + 1] - 2;
@@ -1819,7 +1819,7 @@
for (s = 0; s < sides; ++s) {
for (x = 0; x < st2; ++x) {
vvmap[dst + crossedgelen * (s + 1) - base - x * skip - 1] = lsrc;
- ++lsrc;
+ lsrc++;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -512,9 +512,9 @@
vec[0]/=delta[0];
vec[1]/=delta[1];
vec[2]/=delta[2];
- (pa +((int)(vec[0]*(size[0]-1))*res
- +(int)(vec[1]*(size[1]-1)))*res
- +(int)(vec[2]*(size[2]-1)))->flag &= ~PARS_UNEXIST;
+ (pa + ((int)(vec[0] * (size[0] - 1)) * res +
+ (int)(vec[1] * (size[1] - 1))) * res +
+ (int)(vec[2] * (size[2] - 1)))->flag &= ~PARS_UNEXIST;
}
}
else if (ELEM(from, PART_FROM_FACE, PART_FROM_VOLUME)) {
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -312,8 +312,7 @@
if (cp) strncpy(cp, seq->name + 2, sizeof(seq->name) - 2);
if (seq->plugin->current_private_data) {
- *seq->plugin->current_private_data
- = seq->plugin->instance_private_data;
+ *seq->plugin->current_private_data = seq->plugin->instance_private_data;
}
float_rendering = (out->rect_float != NULL);
@@ -1094,8 +1093,7 @@
while (x--) {
*rt = gammaCorrect(
- fac1 * invGammaCorrect(*rt1)
- + fac2 * invGammaCorrect(*rt2));
+ fac1 * invGammaCorrect(*rt1) + fac2 * invGammaCorrect(*rt2));
rt1++; rt2++; rt++;
}
@@ -1106,8 +1104,7 @@
while (x--) {
*rt = gammaCorrect(
- fac1 * invGammaCorrect(*rt1)
- + fac2 * invGammaCorrect(*rt2));
+ fac1 * invGammaCorrect(*rt1) + fac2 * invGammaCorrect(*rt2));
rt1++; rt2++; rt++;
}
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -3934,8 +3934,7 @@
}
if (seq->strip->color_balance) {
- seqn->strip->color_balance
- = MEM_dupallocN(seq->strip->color_balance);
+ seqn->strip->color_balance = MEM_dupallocN(seq->strip->color_balance);
}
if (seq->type == SEQ_META) {
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -3514,11 +3514,11 @@
totvert= lt->pntsu*lt->pntsv*lt->pntsw;
if (ob->softflag & OB_SB_EDGES) {
- totspring = ((lt->pntsu -1) * lt->pntsv
- + (lt->pntsv -1) * lt->pntsu) * lt->pntsw
- +lt->pntsu*lt->pntsv*(lt->pntsw -1);
+ totspring = ((lt->pntsu - 1) * lt->pntsv +
+ (lt->pntsv - 1) * lt->pntsu) * lt->pntsw +
+ lt->pntsu*lt->pntsv * (lt->pntsw - 1);
if (ob->softflag & OB_SB_QUADS) {
- totspring += 4*(lt->pntsu -1) * (lt->pntsv -1) * (lt->pntsw-1);
+ totspring += 4 * (lt->pntsu - 1) * (lt->pntsv -1) * (lt->pntsw - 1);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-05-09 09:02:06 UTC (rev 46454)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-05-09 09:24:15 UTC (rev 46455)
@@ -730,8 +730,9 @@
int gridInternalEnd;
i = 0;
- while (i < lastface && vertNum >= ccgdm->faceMap[i + 1].startVert)
- ++i;
+ while (i < lastface && vertNum >= ccgdm->faceMap[i + 1].startVert) {
+ i++;
+ }
f = ccgdm->faceMap[i].face;
numVerts = ccgSubSurf_getFaceNumVerts(f);
@@ -774,8 +775,9 @@
int x;
i = 0;
- while (i < lastedge && vertNum >= ccgdm->edgeMap[i + 1].startVert)
- ++i;
+ while (i < lastedge && vertNum >= ccgdm->edgeMap[i + 1].startVert) {
+ i++;
+ }
e = ccgdm->edgeMap[i].edge;
@@ -869,8 +871,9 @@
#endif
i = 0;
- while (i < lastface && edgeNum >= ccgdm->faceMap[i + 1].startEdge)
- ++i;
+ while (i < lastface && edgeNum >= ccgdm->faceMap[i + 1].startEdge) {
+ i++;
+ }
f = ccgdm->faceMap[i].face;
/* numVerts = ccgSubSurf_getFaceNumVerts(f); */ /*UNUSED*/
@@ -1144,8 +1147,7 @@
if (edgeFlags) {
if (edgeIdx != -1) {
- flags |= (edgeFlags[index] & (ME_SEAM | ME_SHARP))
- | ME_EDGEDRAW | ME_EDGERENDER;
+ flags |= ((edgeFlags[index] & (ME_SEAM | ME_SHARP)) | ME_EDGEDRAW | ME_EDGERENDER);
}
}
else {
@@ -3169,10 +3171,10 @@
numVerts, vertNum);
if (vertOrigIndex) {
*vertOrigIndex = ORIGINDEX_NONE;
- ++vertOrigIndex;
+ vertOrigIndex++;
}
- ++vertNum;
+ vertNum++;
/*interpolate per-vert data*/
for (s = 0; s < numVerts; s++) {
@@ -3183,10 +3185,10 @@
if (vertOrigIndex) {
*vertOrigIndex = ORIGINDEX_NONE;
- ++vertOrigIndex;
+ vertOrigIndex++;
}
- ++vertNum;
+ vertNum++;
}
}
@@ -3200,10 +3202,10 @@
if (vertOrigIndex) {
*vertOrigIndex = ORIGINDEX_NONE;
- ++vertOrigIndex;
+ vertOrigIndex++;
}
- ++vertNum;
+ vertNum++;
}
}
}
@@ -3299,9 +3301,9 @@
DM_interp_vert_data(dm, &ccgdm->dm, vertIdx, w, 2, vertNum);
if (vertOrigIndex) {
*vertOrigIndex = ORIGINDEX_NONE;
- ++vertOrigIndex;
+ vertOrigIndex++;
}
- ++vertNum;
+ vertNum++;
}
for (i = 0; i < numFinalEdges; ++i) {
@@ -3339,9 +3341,9 @@
if (vertOrigIndex) {
*vertOrigIndex = mapIndex;
- ++vertOrigIndex;
+ vertOrigIndex++;
}
- ++vertNum;
+ vertNum++;
}
ccgdm->dm.numVertData = vertNum;
Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c 2012-05-09 09:02:06 UTC (rev 46454)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list