From 1c86d32fa7d4c367370d06b7983410f4c33d58a2 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 25 Nov 2020 12:24:32 +0100 Subject: Nodes: deduplicate ping pong math operation The formula did not change. The only side effect of this change should be that the compositor node now does not divide by zero in some cases. --- source/blender/compositor/operations/COM_MathBaseOperation.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cpp b/source/blender/compositor/operations/COM_MathBaseOperation.cpp index edd5bb6d139..dbec6dd1874 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_MathBaseOperation.cpp @@ -671,9 +671,7 @@ void MathPingpongOperation::executePixelSampled(float output[4], this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler); this->m_inputValue2Operation->readSampled(inputValue2, x, y, sampler); - output[0] = fabsf(fractf((inputValue1[0] - inputValue2[0]) / (inputValue2[0] * 2.0f)) * - inputValue2[0] * 2.0f - - inputValue2[0]); + output[0] = pingpongf(inputValue1[0], inputValue2[0]); clampIfNeeded(output); } -- cgit v1.2.3