[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46084] trunk/blender/source: style cleanup: function calls & whitespace.
Campbell Barton
ideasman42 at gmail.com
Sun Apr 29 19:11:40 CEST 2012
Revision: 46084
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46084
Author: campbellbarton
Date: 2012-04-29 17:11:40 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
style cleanup: function calls & whitespace.
Modified Paths:
--------------
trunk/blender/source/blender/avi/AVI_avi.h
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/avi/intern/codecs.c
trunk/blender/source/blender/avi/intern/endian.c
trunk/blender/source/blender/avi/intern/options.c
trunk/blender/source/blender/blenfont/intern/blf_lang.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/bmfont.c
trunk/blender/source/blender/blenkernel/intern/bvhutils.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/fluidsim.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/gpencil.c
trunk/blender/source/blender/blenkernel/intern/group.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenlib/BLI_utildefines.h
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/blenpluginapi/intern/pluginapi.c
trunk/blender/source/blender/collada/ErrorHandler.h
trunk/blender/source/blender/collada/ExtraHandler.h
trunk/blender/source/blender/collada/ExtraTags.h
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_deps.c
trunk/blender/source/blender/editors/animation/anim_draw.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/anim_ipo_utils.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/drivers.c
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/animation/keyframes_draw.c
trunk/blender/source/blender/editors/animation/keyframes_general.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/poseSlide.c
trunk/blender/source/blender/editors/armature/poseUtils.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/gpencil/gpencil_ops.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/physics/particle_object.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_action/action_select.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_graph/graph_draw.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/editors/space_graph/graph_select.c
trunk/blender/source/blender/editors/space_graph/graph_utils.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_nla/nla_channels.c
trunk/blender/source/blender/editors/space_nla/nla_draw.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_nla/nla_ops.c
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_text/text_python.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
trunk/blender/source/blender/render/intern/raytrace/bvh.h
trunk/blender/source/blender/render/intern/raytrace/reorganize.h
trunk/blender/source/blender/render/intern/raytrace/vbvh.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/pixelshading.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/shadbuf.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/gameengine/Ketsji/BL_Shader.h
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
trunk/blender/source/gameengine/Ketsji/KX_FontObject.h
trunk/blender/source/gameengine/Ketsji/KX_PyMath.h
trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
Modified: trunk/blender/source/blender/avi/AVI_avi.h
===================================================================
--- trunk/blender/source/blender/avi/AVI_avi.h 2012-04-29 17:02:52 UTC (rev 46083)
+++ trunk/blender/source/blender/avi/AVI_avi.h 2012-04-29 17:11:40 UTC (rev 46084)
@@ -235,28 +235,28 @@
/**
* Test whether this is an avi-format.
*/
-int AVI_is_avi (const char *name);
+int AVI_is_avi(const char *name);
/**
* Open a compressed file, decompress it into memory.
*/
-AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...);
+AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...);
/**
* Finalize a compressed output stream.
*/
-AviError AVI_close_compress (AviMovie *movie);
+AviError AVI_close_compress(AviMovie *movie);
/**
* Choose a compression option for \<movie\>. Possible options are
* AVI_OPTION_TYPE_MAIN, AVI_OPTION_TYPE_STRH, AVI_OPTION_TYPE_STRF
*/
-AviError AVI_set_compress_option (AviMovie *movie,
- int option_type,
- int stream,
- AviOption option,
- void *opt_data);
+AviError AVI_set_compress_option(AviMovie *movie,
+ int option_type,
+ int stream,
+ AviOption option,
+ void *opt_data);
/* Hmmm... there should be some explanantion about what these mean */
/**
* Compression option, for use in avi_set_compress_option
@@ -275,35 +275,35 @@
* Direct the streams \<avist_type\> to \<movie\>. Redirect \<stream_num\>
* streams.
*/
-int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num);
+int AVI_get_stream(AviMovie *movie, int avist_type, int stream_num);
/**
* Open a movie stream from file.
*/
-AviError AVI_open_movie (const char *name, AviMovie *movie);
+AviError AVI_open_movie(const char *name, AviMovie *movie);
/**
* Read a frame from a movie stream.
*/
-void *AVI_read_frame (AviMovie *movie,
- AviFormat format,
- int frame,
- int stream);
+void *AVI_read_frame(AviMovie *movie,
+ AviFormat format,
+ int frame,
+ int stream);
/**
* Close an open movie stream.
*/
-AviError AVI_close (AviMovie *movie);
+AviError AVI_close(AviMovie *movie);
/**
* Write frames to a movie stream.
*/
-AviError AVI_write_frame (AviMovie *movie, int frame_num, ...);
+AviError AVI_write_frame(AviMovie *movie, int frame_num, ...);
/**
* Unused but still external
*/
-AviError AVI_print_error (AviError error);
-void AVI_set_debug (int mode);
+AviError AVI_print_error(AviError error);
+void AVI_set_debug(int mode);
#endif /* __AVI_AVI_H__ */
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2012-04-29 17:02:52 UTC (rev 46083)
+++ trunk/blender/source/blender/avi/intern/avi.c 2012-04-29 17:11:40 UTC (rev 46084)
@@ -58,8 +58,8 @@
#define DEBUG_PRINT(x) if (AVI_DEBUG) { printf("AVI DEBUG: " x); } (void)0
/* local functions */
-char *fcc_to_char (unsigned int fcc);
-char *tcc_to_char (unsigned int tcc);
+char *fcc_to_char(unsigned int fcc);
+char *tcc_to_char(unsigned int tcc);
@@ -89,7 +89,7 @@
return FCC (tmp);
}
-char *fcc_to_char (unsigned int fcc)
+char *fcc_to_char(unsigned int fcc)
{
DEBUG_FCC[0]= (fcc)&127;
DEBUG_FCC[1]= (fcc>>8)&127;
@@ -99,7 +99,7 @@
return DEBUG_FCC;
}
-char *tcc_to_char (unsigned int tcc)
+char *tcc_to_char(unsigned int tcc)
{
DEBUG_FCC[0]= (tcc)&127;
DEBUG_FCC[1]= (tcc>>8)&127;
@@ -109,7 +109,7 @@
return DEBUG_FCC;
}
-int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num)
+int AVI_get_stream(AviMovie *movie, int avist_type, int stream_num)
{
int cur_stream;
@@ -157,7 +157,7 @@
return 1;
}
-AviError AVI_print_error (AviError in_error)
+AviError AVI_print_error(AviError in_error)
{
int error;
@@ -200,12 +200,12 @@
return in_error;
}
#if 0
-void AVI_set_debug (int mode)
+void AVI_set_debug(int mode)
{
AVI_DEBUG= mode;
}
-int AVI_is_avi (char *name)
+int AVI_is_avi(char *name)
{
FILE *fp;
int ret;
@@ -228,7 +228,7 @@
}
#endif
-int AVI_is_avi (const char *name)
+int AVI_is_avi(const char *name)
{
int temp, fcca, j;
AviMovie movie= {NULL};
@@ -425,7 +425,7 @@
}
-AviError AVI_open_movie (const char *name, AviMovie *movie)
+AviError AVI_open_movie(const char *name, AviMovie *movie)
{
int temp, fcca, size, j;
@@ -714,7 +714,7 @@
return buffer;
}
-AviError AVI_close (AviMovie *movie)
+AviError AVI_close(AviMovie *movie)
{
int i;
@@ -737,7 +737,7 @@
return AVI_ERROR_NONE;
}
-AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...)
+AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
{
va_list ap;
AviList list;
@@ -933,7 +933,7 @@
return AVI_ERROR_NONE;
}
-AviError AVI_write_frame (AviMovie *movie, int frame_num, ...)
+AviError AVI_write_frame(AviMovie *movie, int frame_num, ...)
{
AviList list;
AviChunk chunk;
@@ -1041,7 +1041,7 @@
return AVI_ERROR_NONE;
}
-AviError AVI_close_compress (AviMovie *movie)
+AviError AVI_close_compress(AviMovie *movie)
{
int temp, movi_size, i;
Modified: trunk/blender/source/blender/avi/intern/codecs.c
===================================================================
--- trunk/blender/source/blender/avi/intern/codecs.c 2012-04-29 17:02:52 UTC (rev 46083)
+++ trunk/blender/source/blender/avi/intern/codecs.c 2012-04-29 17:11:40 UTC (rev 46084)
@@ -85,7 +85,7 @@
return buffer;
}
-int avi_get_data_id (AviFormat format, int stream)
+int avi_get_data_id(AviFormat format, int stream)
{
char fcc[5];
@@ -99,7 +99,7 @@
return FCC(fcc);
}
-int avi_get_format_type (AviFormat format)
+int avi_get_format_type(AviFormat format)
{
switch (format) {
case AVI_FORMAT_RGB24:
@@ -114,7 +114,7 @@
}
}
-int avi_get_format_fcc (AviFormat format)
+int avi_get_format_fcc(AviFormat format)
{
switch (format) {
case AVI_FORMAT_RGB24:
@@ -131,7 +131,7 @@
}
}
-int avi_get_format_compression (AviFormat format)
+int avi_get_format_compression(AviFormat format)
{
switch (format) {
case AVI_FORMAT_RGB24:
Modified: trunk/blender/source/blender/avi/intern/endian.c
===================================================================
--- trunk/blender/source/blender/avi/intern/endian.c 2012-04-29 17:02:52 UTC (rev 46083)
+++ trunk/blender/source/blender/avi/intern/endian.c 2012-04-29 17:11:40 UTC (rev 46084)
@@ -169,7 +169,7 @@
}
#endif /* __BIG_ENDIAN__ */
-void awrite (AviMovie *movie, void *datain, int block, int size, FILE *fp, int type)
+void awrite(AviMovie *movie, void *datain, int block, int size, FILE *fp, int type)
{
#ifdef __BIG_ENDIAN__
void *data;
Modified: trunk/blender/source/blender/avi/intern/options.c
===================================================================
--- trunk/blender/source/blender/avi/intern/options.c 2012-04-29 17:02:52 UTC (rev 46083)
+++ trunk/blender/source/blender/avi/intern/options.c 2012-04-29 17:11:40 UTC (rev 46084)
@@ -44,7 +44,7 @@
/* avi_set_compress_options gets its own file... now don't WE feel important? */
-AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data)
+AviError AVI_set_compress_option(AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data)
{
int i;
int useconds;
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2012-04-29 17:02:52 UTC (rev 46083)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2012-04-29 17:11:40 UTC (rev 46084)
@@ -182,9 +182,9 @@
char *envStr;
if (U.language == 0)/* use system setting */
- envStr = BLI_sprintfN( "LANG=%s", getenv("LANG") );
+ envStr = BLI_sprintfN("LANG=%s", getenv("LANG"));
else
- envStr = BLI_sprintfN( "LANG=%s", short_locale );
+ envStr = BLI_sprintfN("LANG=%s", short_locale);
gettext_putenv(envStr);
MEM_freeN(envStr);
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-29 17:02:52 UTC (rev 46083)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-29 17:11:40 UTC (rev 46084)
@@ -371,7 +371,7 @@
const int numTessFaces = dm->getNumTessFaces(dm);
const int numPolys = dm->getNumPolys(dm);
- if ( (numTessFaces == 0) && (numPolys != 0)) {
+ if ((numTessFaces == 0) && (numPolys != 0)) {
dm->recalcTessellation(dm);
if (dm->getNumTessFaces(dm) != 0) {
@@ -2413,7 +2413,7 @@
}
else {
const float *orco= pMesh->orco[(&pMesh->mface[face_num].v1)[vert_index]];
- map_to_sphere( &fUV[0], &fUV[1], orco[0], orco[1], orco[2]);
+ map_to_sphere(&fUV[0], &fUV[1], orco[0], orco[1], orco[2]);
}
}
@@ -2551,11 +2551,11 @@
}
else {
uv1= uv[0]; uv2= uv[1]; uv3= uv[2]; uv4= uv[3];
- map_to_sphere( &uv[0][0], &uv[0][1], orco[mf->v1][0], orco[mf->v1][1], orco[mf->v1][2]);
- map_to_sphere( &uv[1][0], &uv[1][1], orco[mf->v2][0], orco[mf->v2][1], orco[mf->v2][2]);
- map_to_sphere( &uv[2][0], &uv[2][1], orco[mf->v3][0], orco[mf->v3][1], orco[mf->v3][2]);
+ map_to_sphere(&uv[0][0], &uv[0][1], orco[mf->v1][0], orco[mf->v1][1], orco[mf->v1][2]);
+ map_to_sphere(&uv[1][0], &uv[1][1], orco[mf->v2][0], orco[mf->v2][1], orco[mf->v2][2]);
+ map_to_sphere(&uv[2][0], &uv[2][1], orco[mf->v3][0], orco[mf->v3][1], orco[mf->v3][2]);
if (v4)
- map_to_sphere( &uv[3][0], &uv[3][1], orco[mf->v4][0], orco[mf->v4][1], orco[mf->v4][2]);
+ map_to_sphere(&uv[3][0], &uv[3][1], orco[mf->v4][0], orco[mf->v4][1], orco[mf->v4][2]);
}
tangent_from_uv(uv1, uv2, uv3, v1->co, v2->co, v3->co, fno, tang);
@@ -2578,11 +2578,11 @@
len= (mf->v4)? 4 : 3;
if (mtface == NULL) {
- map_to_sphere( &uv[0][0], &uv[0][1], orco[mf->v1][0], orco[mf->v1][1], orco[mf->v1][2]);
- map_to_sphere( &uv[1][0], &uv[1][1], orco[mf->v2][0], orco[mf->v2][1], orco[mf->v2][2]);
- map_to_sphere( &uv[2][0], &uv[2][1], orco[mf->v3][0], orco[mf->v3][1], orco[mf->v3][2]);
+ map_to_sphere(&uv[0][0], &uv[0][1], orco[mf->v1][0], orco[mf->v1][1], orco[mf->v1][2]);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list