diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:21:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:22:52 +0300 |
commit | aba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch) | |
tree | 2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/render | |
parent | 72a563cdee8fef198a200ff65b57ddb847c01795 (diff) |
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/include/texture.h | 6 | ||||
-rw-r--r-- | source/blender/render/intern/source/multires_bake.c | 15 | ||||
-rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 3 |
3 files changed, 16 insertions, 8 deletions
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index 0dd517ed177..d47413717d4 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -27,10 +27,12 @@ #define BRICONT \ texres->tin = (texres->tin - 0.5f) * tex->contrast + tex->bright - 0.5f; \ if (!(tex->flag & TEX_NO_CLAMP)) { \ - if (texres->tin < 0.0f) \ + if (texres->tin < 0.0f) { \ texres->tin = 0.0f; \ - else if (texres->tin > 1.0f) \ + } \ + else if (texres->tin > 1.0f) { \ texres->tin = 1.0f; \ + } \ } \ ((void)0) diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index 878a774ab37..6fe4c080c2b 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -1012,8 +1012,9 @@ static void build_permutation_table(unsigned short permutation[], { int i, k; - for (i = 0; i < number_of_rays; i++) + for (i = 0; i < number_of_rays; i++) { temp_permutation[i] = i; + } for (i = 0; i < number_of_rays; i++) { const unsigned int nr_entries_left = number_of_rays - i; @@ -1225,12 +1226,14 @@ static void apply_ao_callback(DerivedMesh *lores_dm, lores_dm, hires_dm, ao_data->orig_index_mp_to_orig, lvl, lt, uv[0], uv[1], pos, nrm); /* offset ray origin by user bias along normal */ - for (i = 0; i < 3; i++) + for (i = 0; i < 3; i++) { cen[i] = pos[i] + ao_data->bias * nrm[i]; + } /* build tangent frame */ - for (i = 0; i < 3; i++) + for (i = 0; i < 3; i++) { axisZ[i] = nrm[i]; + } build_coordinate_frame(axisX, axisY, axisZ); @@ -1269,13 +1272,15 @@ static void apply_ao_callback(DerivedMesh *lores_dm, /* transform ray direction out of tangent frame */ float dv[3]; - for (k = 0; k < 3; k++) + for (k = 0; k < 3; k++) { dv[k] = axisX[k] * dx + axisY[k] * dy + axisZ[k] * dz; + } hit_something = trace_ao_ray(ao_data, cen, dv); - if (hit_something != 0) + if (hit_something != 0) { shadow += 1; + } } value = 1.0f - (shadow / ao_data->number_of_rays); diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index f9d4d5715d8..ab8146c6626 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -201,8 +201,9 @@ static void pointdensity_cache_psys( point_data_pointers(pd, &data_vel, &data_life, NULL); #if 0 /* UNUSED */ - if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT)) + if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT)) { childexists = 1; + } #endif for (i = 0, pa = psys->particles; i < total_particles; i++, pa++) { |