blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T49789: Compositor mix node interpolation bug

This commit is contained in:
Sergey Sharybin 2016-10-21 17:56:09 +02:00
parent dac53963a8
commit e1cf002ee6
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/compositor/operations/COM_TextureOperation.cpp
View File

@ -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);