[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60890] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Oct 22 05:04:05 CEST 2013
Revision: 60890
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60890
Author: campbellbarton
Date: 2013-10-22 03:03:56 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2013-10-22 00:25:15 UTC (rev 60889)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2013-10-22 03:03:56 UTC (rev 60890)
@@ -136,7 +136,7 @@
nearest.index = -1;
nearest.dist = FLT_MAX;
#ifndef __APPLE__
-#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(treeData,calc) schedule(static)
+#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(treeData, calc) schedule(static)
#endif
for (i = 0; i < calc->numVerts; ++i) {
float *co = calc->vertexCos[i];
@@ -331,7 +331,7 @@
{
#ifndef __APPLE__
-#pragma omp parallel for private(i,hit) schedule(static)
+#pragma omp parallel for private(i, hit) schedule(static)
#endif
for (i = 0; i < calc->numVerts; ++i) {
float *co = calc->vertexCos[i];
@@ -441,7 +441,7 @@
/* Find the nearest vertex */
#ifndef __APPLE__
-#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(calc,treeData) schedule(static)
+#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(calc, treeData) schedule(static)
#endif
for (i = 0; i < calc->numVerts; ++i) {
float *co = calc->vertexCos[i];
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2013-10-22 00:25:15 UTC (rev 60889)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2013-10-22 03:03:56 UTC (rev 60890)
@@ -1109,7 +1109,7 @@
static void em_combineMaps(EmissionMap *output, EmissionMap *em2, int hires_multiplier, int additive, float sample_size)
{
- int i, x,y,z;
+ int i, x, y, z;
/* copyfill input 1 struct and clear output for new allocation */
EmissionMap em1;
@@ -1227,7 +1227,7 @@
float solid = sfs->particle_size * 0.5f;
float smooth = 0.5f; /* add 0.5 cells of linear falloff to reduce aliasing */
int hires_multiplier = 1;
- int i,z;
+ int i, z;
KDTree *tree;
sim.scene = scene;
Modified: trunk/blender/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_rotation.c 2013-10-22 00:25:15 UTC (rev 60889)
+++ trunk/blender/source/blender/blenlib/intern/math_rotation.c 2013-10-22 03:03:56 UTC (rev 60890)
@@ -1712,7 +1712,7 @@
return (sensor / 2.0f) / tanf(hfov * 0.5f);
}
-/* 'mod_inline(-3,4)= 1', 'fmod(-3,4)= -3' */
+/* 'mod_inline(-3, 4)= 1', 'fmod(-3, 4)= -3' */
static float mod_inline(float a, float b)
{
return a - (b * floorf(a / b));
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-10-22 00:25:15 UTC (rev 60889)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-10-22 03:03:56 UTC (rev 60890)
@@ -3446,7 +3446,7 @@
" inline void sname::identifier(int value) { sname##_##identifier##_set(&ptr, value); }\n"
"\n"
"#define BOOLEAN_ARRAY_PROPERTY(sname, size, identifier) \\\n"
-" inline Array<int,size> sname::identifier(void) \\\n"
+" inline Array<int, size> sname::identifier(void) \\\n"
" { Array<int, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; } \\\n"
" inline void sname::identifier(int values[size]) \\\n"
" { sname##_##identifier##_set(&ptr, values); } \\\n"
@@ -3466,7 +3466,7 @@
" inline void sname::identifier(int value) { sname##_##identifier##_set(&ptr, value); }\n"
"\n"
"#define INT_ARRAY_PROPERTY(sname, size, identifier) \\\n"
-" inline Array<int,size> sname::identifier(void) \\\n"
+" inline Array<int, size> sname::identifier(void) \\\n"
" { Array<int, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; } \\\n"
" inline void sname::identifier(int values[size]) \\\n"
" { sname##_##identifier##_set(&ptr, values); } \\\n"
@@ -3486,7 +3486,7 @@
" inline void sname::identifier(float value) { sname##_##identifier##_set(&ptr, value); }\n"
"\n"
"#define FLOAT_ARRAY_PROPERTY(sname, size, identifier) \\\n"
-" inline Array<float,size> sname::identifier(void) \\\n"
+" inline Array<float, size> sname::identifier(void) \\\n"
" { Array<float, size> ar; sname##_##identifier##_get(&ptr, ar.data); return ar; } \\\n"
" inline void sname::identifier(float values[size]) \\\n"
" { sname##_##identifier##_set(&ptr, values); } \\\n"
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2013-10-22 00:25:15 UTC (rev 60889)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2013-10-22 03:03:56 UTC (rev 60890)
@@ -334,7 +334,7 @@
* cleanup */
/* ------------------------------------------------------------------------- */
-#define UVTOINDEX(u,v) (startvlak + (u) * sizev + (v))
+#define UVTOINDEX(u, v) (startvlak + (u) * sizev + (v))
/*
*
* NOTE THAT U/V COORDINATES ARE SOMETIMES SWAPPED !!
More information about the Bf-blender-cvs
mailing list