style cleanup

diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 5c9c564998e6cd104b794ab990826e3383c04048..3a6912157fd8605b21b42785791becba76c80cf9 100644 (file)
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -136,7 +136,7 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
        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 @@ static void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc)
        {
 
 #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 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc)
 
        /* 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];

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index a40bfd48c399074329bcde03319e102a23dbaef0..b7251a5e795853abab0ac7cefbf3e15652d22d05 100644 (file)
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1109,7 +1109,7 @@ static void em_freeData(EmissionMap *em)
 
 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 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke
                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;

diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index 2eebe10dd5849bf323078fe736ca32922191b550..41535cf32b63a8746ba7f43b06ddc3dfd793cd3a 100644 (file)
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -1712,7 +1712,7 @@ float fov_to_focallength(float hfov, float sensor)
        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));

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index b4b3fea09c72d2b9b56833621dbc5d711c6c1b8c..1cb9eb8e9ae3cb7866db719f777f3835a1db865a 100644 (file)
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -3446,7 +3446,7 @@ static const char *cpp_classes = ""
 "      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 @@ static const char *cpp_classes = ""
 "      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 @@ static const char *cpp_classes = ""
 "      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"

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index b37489d70b3dd27d99a238febb21b7f4459d0d42..8e90ddbb42b1de45e6cbc8b8c3e1173d0246a7f9 100644 (file)
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -334,7 +334,7 @@ void RE_make_stars(Render *re, Scene *scenev3d, void (*initfunc)(void),
  * 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 !!