diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-14 12:12:45 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-14 12:12:45 +0300 |
commit | 1c870f46e79c6378488bd84ed9ffbb40affae464 (patch) | |
tree | 602b7b04cd5313194f2e9266442e8dd61bbee057 /source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp | |
parent | de9ec80e644bb86a3ebb258db9135c3ee32bdcac (diff) |
Compositor: Cleanup, don't shortcut float values
Use 0.0f instead of 0.f and so on.
Diffstat (limited to 'source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp index fa9a957f83c..7fdd10affaf 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp @@ -79,8 +79,8 @@ void ConvertDepthToRadiusOperation::executePixelSampled(float output[4], float x float radius; this->m_inputOperation->readSampled(inputValue, x, y, sampler); z = inputValue[0]; - if (z != 0.f) { - float iZ = (1.f / z); + if (z != 0.0f) { + float iZ = (1.0f / z); // bug #6656 part 2b, do not rescale #if 0 @@ -88,7 +88,7 @@ void ConvertDepthToRadiusOperation::executePixelSampled(float output[4], float x // scale crad back to original maximum and blend crad->rect[px] = bcrad + wts->rect[px] * (scf * crad->rect[px] - bcrad); #endif - radius = 0.5f * fabsf(this->m_aperture * (this->m_dof_sp * (this->m_inverseFocalDistance - iZ) - 1.f)); + radius = 0.5f * fabsf(this->m_aperture * (this->m_dof_sp * (this->m_inverseFocalDistance - iZ) - 1.0f)); // 'bug' #6615, limit minimum radius to 1 pixel, not really a solution, but somewhat mitigates the problem if (radius < 0.0f) radius = 0.0f; if (radius > this->m_maxRadius) { |