Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-02-15 17:30:17 +0300
committerJacques Lucke <jacques@blender.org>2021-02-15 17:30:17 +0300
commitd3960164163c910d5031a8f076c41b39e0a5503d (patch)
tree2931c76ced3945e8f06c9c163cba37b69d06f640 /source/blender/draw/engines/eevee/eevee_depth_of_field.c
parentb55e7e489504f43076eec423bc8dfb7efbeb4fac (diff)
Cleanup: clang tidy
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_depth_of_field.c')
-rw-r--r--source/blender/draw/engines/eevee/eevee_depth_of_field.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index 8c0a44b2c9b..bd6c6242f86 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -56,12 +56,10 @@ static float coc_radius_from_camera_depth(bool is_ortho, EEVEE_EffectsInfo *fx,
if (multiplier == 0.0f || bias == 0.0f) {
return 0.0f;
}
- else if (is_ortho) {
+ if (is_ortho) {
return (camera_depth + multiplier / bias) * multiplier;
}
- else {
- return multiplier / camera_depth - bias;
- }
+ return multiplier / camera_depth - bias;
}
static float polygon_sides_length(float sides_count)
@@ -164,11 +162,11 @@ bool EEVEE_depth_of_field_jitter_get(EEVEE_EffectsInfo *fx,
return true;
}
-int EEVEE_depth_of_field_sample_count_get(EEVEE_EffectsInfo *fx,
+int EEVEE_depth_of_field_sample_count_get(EEVEE_EffectsInfo *effects,
int sample_count,
int *r_ring_count)
{
- if (fx->dof_jitter_radius == 0.0f) {
+ if (effects->dof_jitter_radius == 0.0f) {
if (r_ring_count != NULL) {
*r_ring_count = 0;
}