diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-03-05 16:54:32 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-03-05 18:56:14 +0300 |
| commit | ba5961b4cda402389c7c3092a1bd092d9fd98bb2 (patch) | |
| tree | 15555e3498e828e55230bb2d7ae4b1225596506a /source/blender/compositor/operations/COM_MathBaseOperation.cpp | |
| parent | 3d3a5bb89240ef160d2a63da85eae937eb578e53 (diff) | |
Cleanup: use MIN2/MAX2 in compositor.
Diffstat (limited to 'source/blender/compositor/operations/COM_MathBaseOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_MathBaseOperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cpp b/source/blender/compositor/operations/COM_MathBaseOperation.cpp index dbec6dd1874..692c1e70462 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_MathBaseOperation.cpp @@ -351,7 +351,7 @@ void MathMinimumOperation::executePixelSampled(float output[4], this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler); this->m_inputValue2Operation->readSampled(inputValue2, x, y, sampler); - output[0] = min(inputValue1[0], inputValue2[0]); + output[0] = MIN2(inputValue1[0], inputValue2[0]); clampIfNeeded(output); } @@ -367,7 +367,7 @@ void MathMaximumOperation::executePixelSampled(float output[4], this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler); this->m_inputValue2Operation->readSampled(inputValue2, x, y, sampler); - output[0] = max(inputValue1[0], inputValue2[0]); + output[0] = MAX2(inputValue1[0], inputValue2[0]); clampIfNeeded(output); } |