diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp index 50f8eab5fbc..fe395ecae9e 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp @@ -21,15 +21,15 @@ #include "BLI_math.h" #include "DNA_camera_types.h" -ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation() : NodeOperation() +ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation() { this->addInputSocket(COM_DT_VALUE); this->addOutputSocket(COM_DT_VALUE); - this->m_inputOperation = NULL; + this->m_inputOperation = nullptr; this->m_fStop = 128.0f; - this->m_cameraObject = NULL; + this->m_cameraObject = nullptr; this->m_maxRadius = 32.0f; - this->m_blurPostOperation = NULL; + this->m_blurPostOperation = nullptr; } float ConvertDepthToRadiusOperation::determineFocalDistance() @@ -46,7 +46,7 @@ float ConvertDepthToRadiusOperation::determineFocalDistance() void ConvertDepthToRadiusOperation::initExecution() { float cam_sensor = DEFAULT_SENSOR_WIDTH; - Camera *camera = NULL; + Camera *camera = nullptr; if (this->m_cameraObject && this->m_cameraObject->type == OB_CAMERA) { camera = (Camera *)this->m_cameraObject->data; @@ -86,7 +86,7 @@ void ConvertDepthToRadiusOperation::executePixelSampled(float output[4], if (z != 0.0f) { float iZ = (1.0f / z); - // bug #6656 part 2b, do not rescale + /* bug T6656 part 2b, do not re-scale. */ #if 0 bcrad = 0.5f * fabs(aperture * (dof_sp * (cam_invfdist - iZ) - 1.0f)); // scale crad back to original maximum and blend @@ -94,8 +94,8 @@ void ConvertDepthToRadiusOperation::executePixelSampled(float output[4], #endif 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 + /* 'bug' T6615, limit minimum radius to 1 pixel, + * not really a solution, but somewhat mitigates the problem. */ if (radius < 0.0f) { radius = 0.0f; } @@ -111,5 +111,5 @@ void ConvertDepthToRadiusOperation::executePixelSampled(float output[4], void ConvertDepthToRadiusOperation::deinitExecution() { - this->m_inputOperation = NULL; + this->m_inputOperation = nullptr; } |