[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45126] trunk/blender/source/blender: style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Campbell Barton
ideasman42 at gmail.com
Sat Mar 24 07:24:56 CET 2012
Revision: 45126
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45126
Author: campbellbarton
Date: 2012-03-24 06:24:53 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/avi/intern/avirgb.c
trunk/blender/source/blender/avi/intern/mjpeg.c
trunk/blender/source/blender/avi/intern/rgb32.c
trunk/blender/source/blender/blenfont/intern/blf_glyph.c
trunk/blender/source/blender/blenfont/intern/blf_translation.c
trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_object_force.c
trunk/blender/source/blender/makesrna/intern/rna_property.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_bevel.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_multires.c
trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
trunk/blender/source/blender/modifiers/intern/MOD_remesh.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/modifiers/intern/MOD_shapekey.c
trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
trunk/blender/source/blender/modifiers/intern/MOD_surface.c
trunk/blender/source/blender/modifiers/intern/MOD_util.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/modifiers/intern/MOD_warp.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
trunk/blender/source/blender/python/generic/py_capi_utils.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_apple.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_dragdrop.c
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_subwindow.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2012-03-24 06:18:31 UTC (rev 45125)
+++ trunk/blender/source/blender/avi/intern/avi.c 2012-03-24 06:24:53 UTC (rev 45126)
@@ -216,7 +216,8 @@
!GET_FCC (fp) ||
GET_FCC (fp) != FCC("AVI ")) {
ret = 0;
- } else {
+ }
+ else {
ret = 1;
}
@@ -312,9 +313,11 @@
fcca == FCC ("RAW ") ||
fcca == 0) {
movie.streams[temp].format = AVI_FORMAT_AVI_RGB;
- } else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) {
+ }
+ else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) {
movie.streams[temp].format = AVI_FORMAT_MJPEG;
- } else {
+ }
+ else {
MEM_freeN(movie.streams);
fclose(movie.fp);
return 0;
@@ -379,10 +382,12 @@
fcca == FCC ("rgb ") ||
fcca == FCC ("RAW ") ||
fcca == 0 ) {
- } else if ( fcca == FCC ("mjpg") ||
+ }
+ else if ( fcca == FCC ("mjpg") ||
fcca == FCC ("MJPG")) {
movie.streams[temp].format = AVI_FORMAT_MJPEG;
- } else {
+ }
+ else {
MEM_freeN(movie.streams);
fclose(movie.fp);
return 0;
@@ -391,7 +396,8 @@
}
if (j > 0) fseek (movie.fp, j, SEEK_CUR);
- } else fseek (movie.fp, movie.streams[temp].sf_size, SEEK_CUR);
+ }
+ else fseek (movie.fp, movie.streams[temp].sf_size, SEEK_CUR);
/* Walk to the next LIST */
while (GET_FCC (movie.fp) != FCC("LIST")) {
@@ -495,9 +501,11 @@
fcca == FCC ("RAW ") ||
fcca == 0) {
movie->streams[temp].format = AVI_FORMAT_AVI_RGB;
- } else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) {
+ }
+ else if (fcca == FCC ("mjpg")||fcca == FCC ("MJPG")) {
movie->streams[temp].format = AVI_FORMAT_MJPEG;
- } else {
+ }
+ else {
return AVI_ERROR_COMPRESSION;
}
}
@@ -558,17 +566,20 @@
fcca == FCC ("rgb ") ||
fcca == FCC ("RAW ") ||
fcca == 0 ) {
- } else if ( fcca == FCC ("mjpg") ||
+ }
+ else if ( fcca == FCC ("mjpg") ||
fcca == FCC ("MJPG")) {
movie->streams[temp].format = AVI_FORMAT_MJPEG;
- } else {
+ }
+ else {
return AVI_ERROR_COMPRESSION;
}
}
}
if (j > 0) fseek (movie->fp, j, SEEK_CUR);
- } else fseek (movie->fp, movie->streams[temp].sf_size, SEEK_CUR);
+ }
+ else fseek (movie->fp, movie->streams[temp].sf_size, SEEK_CUR);
/* Walk to the next LIST */
while (GET_FCC (movie->fp) != FCC("LIST")) {
@@ -595,7 +606,8 @@
break;
else
fseek (movie->fp, size-4, SEEK_CUR);
- } else {
+ }
+ else {
fseek (movie->fp, size, SEEK_CUR);
}
if (ftell(movie->fp) > movie->size) {
@@ -659,7 +671,7 @@
/* Retrieve the record number of the desired frame in the index
* If a chunk has Size 0 we need to rewind to previous frame */
- while(rewind && frame > -1) {
+ while (rewind && frame > -1) {
i=0;
cur_frame=-1;
rewind = 0;
@@ -670,7 +682,8 @@
if ((cur_frame == frame -1) && (movie->entries[i].Size == 0)) {
rewind = 1;
frame = frame -1;
- } else {
+ }
+ else {
cur_frame++;
}
}
@@ -802,7 +815,8 @@
movie->streams[i].sf = MEM_mallocN (sizeof(AviBitmapInfoHeader)
+ sizeof(AviMJPEGUnknown),"moviestreamformatL");
movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader) + sizeof(AviMJPEGUnknown);
- } else {
+ }
+ else {
#endif
movie->streams[i].sf = MEM_mallocN (sizeof(AviBitmapInfoHeader), "moviestreamformatS");
movie->streams[i].sf_size = sizeof(AviBitmapInfoHeader);
Modified: trunk/blender/source/blender/avi/intern/avirgb.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avirgb.c 2012-03-24 06:18:31 UTC (rev 45125)
+++ trunk/blender/source/blender/avi/intern/avirgb.c 2012-03-24 06:24:53 UTC (rev 45126)
@@ -94,7 +94,8 @@
MEM_freeN (buffer);
return buf;
- } else {
+ }
+ else {
buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "fromavirgbbuf");
rowstride = movie->header->Width*3;
Modified: trunk/blender/source/blender/avi/intern/mjpeg.c
===================================================================
--- trunk/blender/source/blender/avi/intern/mjpeg.c 2012-03-24 06:18:31 UTC (rev 45125)
+++ trunk/blender/source/blender/avi/intern/mjpeg.c 2012-03-24 06:24:53 UTC (rev 45126)
@@ -159,7 +159,7 @@
jpeg_create_decompress(&dinfo);
jpegmemsrcmgr_build(&dinfo, inBuffer, bufsize);
jpeg_read_header(&dinfo, TRUE);
- if (dinfo.dc_huff_tbl_ptrs[0] == NULL){
+ if (dinfo.dc_huff_tbl_ptrs[0] == NULL) {
std_huff_tables(&dinfo);
}
dinfo.out_color_space = JCS_RGB;
@@ -181,13 +181,13 @@
numbytes= 0;
jpeg_read_header(&dinfo, TRUE);
- if (dinfo.dc_huff_tbl_ptrs[0] == NULL){
+ if (dinfo.dc_huff_tbl_ptrs[0] == NULL) {
std_huff_tables(&dinfo);
}
jpeg_start_decompress(&dinfo);
rowstride= dinfo.output_width*dinfo.output_components;
- for (y= 0; y<dinfo.output_height; y++){
+ for (y= 0; y<dinfo.output_height; y++) {
jpeg_read_scanlines(&dinfo, (JSAMPARRAY) &outBuffer, 1);
outBuffer += rowstride;
}
@@ -251,7 +251,7 @@
jpeg_write_marker (&cinfo, JPEG_COM, marker, 60);
rowstride= cinfo.image_width*cinfo.input_components;
- for (y = 0; y < cinfo.image_height; y++){
+ for (y = 0; y < cinfo.image_height; y++) {
jpeg_write_scanlines(&cinfo, (JSAMPARRAY) &inBuffer, 1);
inBuffer += rowstride;
}
@@ -301,7 +301,8 @@
MEM_freeN(tmpbuf);
return ret;
- } else {
+ }
+ else {
return Decode_JPEG(inbuf, outbuf, width, height, bufsize);
}
}
@@ -329,7 +330,8 @@
Compress_JPEG(quality, outbuf, tmpbuf, jwidth, jheight, bufsize);
MEM_freeN(tmpbuf);
- } else {
+ }
+ else {
Compress_JPEG(quality, outbuf, inbuf, width, height, bufsize);
}
}
@@ -369,7 +371,8 @@
buf = MEM_mallocN (movie->header->Height * movie->header->Width * 3, "avi.avi_converter_to_mjpeg 1");
if (!movie->interlace) {
check_and_compress_jpeg(movie->streams[stream].sh.Quality/100, buf, buffer, movie->header->Width, movie->header->Height, bufsize);
- } else {
+ }
+ else {
deinterlace (movie->odd_fields, buf, buffer, movie->header->Width, movie->header->Height);
MEM_freeN (buffer);
Modified: trunk/blender/source/blender/avi/intern/rgb32.c
===================================================================
--- trunk/blender/source/blender/avi/intern/rgb32.c 2012-03-24 06:18:31 UTC (rev 45125)
+++ trunk/blender/source/blender/avi/intern/rgb32.c 2012-03-24 06:24:53 UTC (rev 45126)
@@ -82,7 +82,7 @@
to= buf; from= buffer;
i=movie->header->Height*movie->header->Width;
- while(i--) {
+ while (i--) {
memcpy(to, from, 3);
to+=4; from+=3;
}
Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2012-03-24 06:18:31 UTC (rev 45125)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c 2012-03-24 06:24:53 UTC (rev 45126)
@@ -239,7 +239,8 @@
err += FT_Bitmap_Convert(font->ft_lib, &slot->bitmap, &tempbitmap, 1); /* Does Blender use Pitch 1 always? It works so far */
err += FT_Bitmap_Copy(font->ft_lib, &tempbitmap, &slot->bitmap);
err += FT_Bitmap_Done(font->ft_lib, &tempbitmap);
- } else {
+ }
+ else {
err = FT_Render_Glyph(slot, FT_RENDER_MODE_NORMAL);
}
Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c 2012-03-24 06:18:31 UTC (rev 45125)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c 2012-03-24 06:24:53 UTC (rev 45126)
@@ -157,7 +157,7 @@
const char *BLF_translate_do_iface(const char *context, const char *msgid)
{
#ifdef WITH_INTERNATIONAL
- if(BLF_translate_iface()) {
+ if (BLF_translate_iface()) {
if (context)
return BLF_pgettext(context, msgid);
else
@@ -174,7 +174,7 @@
const char *BLF_translate_do_tooltip(const char *context, const char *msgid)
{
#ifdef WITH_INTERNATIONAL
- if(BLF_translate_tooltips()) {
+ if (BLF_translate_tooltips()) {
if (context)
return BLF_pgettext(context, msgid);
else
Modified: trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
===================================================================
--- trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c 2012-03-24 06:18:31 UTC (rev 45125)
+++ trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c 2012-03-24 06:24:53 UTC (rev 45126)
@@ -65,8 +65,8 @@
int a, t, segcount= 0, size, newsize, *oldparent, parent;
/* find IK constraint, and validate it */
- for(con= pchan_tip->constraints.first; con; con= con->next) {
- if(con->type==CONSTRAINT_TYPE_KINEMATIC) {
+ for (con= pchan_tip->constraints.first; con; con= con->next) {
+ if (con->type==CONSTRAINT_TYPE_KINEMATIC) {
data=(bKinematicConstraint*)con->data;
if (data->flag & CONSTRAINT_IK_AUTO) break;
if (data->tar==NULL) continue;
@@ -74,36 +74,36 @@
if ((con->flag & (CONSTRAINT_DISABLE|CONSTRAINT_OFF))==0 && (con->enforce != 0.0f)) break;
}
}
- if(con==NULL) return;
+ if (con==NULL) return;
/* exclude tip from chain? */
- if(!(data->flag & CONSTRAINT_IK_TIP))
+ if (!(data->flag & CONSTRAINT_IK_TIP))
pchan_tip= pchan_tip->parent;
/* Find the chain's root & count the segments needed */
- for (curchan = pchan_tip; curchan; curchan=curchan->parent){
+ for (curchan = pchan_tip; curchan; curchan=curchan->parent) {
pchan_root = curchan;
curchan->flag |= POSE_CHAIN; // don't forget to clear this
chanlist[segcount]=curchan;
segcount++;
- if(segcount==data->rootbone || segcount>255) break; // 255 is weak
+ if (segcount==data->rootbone || segcount>255) break; // 255 is weak
}
if (!segcount) return;
/* setup the chain data */
/* we make tree-IK, unless all existing targets are in this chain */
- for(tree= pchan_root->iktree.first; tree; tree= tree->next) {
- for(target= tree->targets.first; target; target= target->next) {
+ for (tree= pchan_root->iktree.first; tree; tree= tree->next) {
+ for (target= tree->targets.first; target; target= target->next) {
curchan= tree->pchan[target->tip];
- if(curchan->flag & POSE_CHAIN)
+ if (curchan->flag & POSE_CHAIN)
curchan->flag &= ~POSE_CHAIN;
else
break;
}
- if(target) break;
+ if (target) break;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list