From fd4caafc53a1c2558f1a27eeaecffb130a146ff4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 21 Oct 2016 17:56:09 +0200 Subject: Fix T49789: Compositor mix node interpolation bug --- .../blender/compositor/operations/COM_TextureOperation.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp index 665bffc2c1c..bba5c8702b8 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cpp +++ b/source/blender/compositor/operations/COM_TextureOperation.cpp @@ -110,8 +110,18 @@ void TextureBaseOperation::executePixelSampled(float output[4], float x, float y int retval; const float cx = this->getWidth() / 2; const float cy = this->getHeight() / 2; - const float u = (x - cx) / this->getWidth() * 2; - const float v = (y - cy) / this->getHeight() * 2; + float u = (x - cx) / this->getWidth() * 2; + float v = (y - cy) / this->getHeight() * 2; + + /* When no interpolation/filtering happens in multitex() foce nearest interpolation. + * We do it here because (a) we can't easily say multitex() that we want nearest + * interpolaiton and (b) in such configuration multitex() sinply floor's the value + * which often produces artifacts. + */ + if ((m_texture->imaflag & TEX_INTERPOL) == 0) { + u += 0.5f / cx; + v += 0.5f / cy; + } this->m_inputSize->readSampled(textureSize, x, y, sampler); this->m_inputOffset->readSampled(textureOffset, x, y, sampler); -- cgit v1.2.3