diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-09 10:45:01 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-09 10:48:42 +0300 |
commit | 2ae0f1e70be543b37f426dc1b7d8a44b05301faf (patch) | |
tree | acb1ff112941faf9cced6a3183e71faf688777ef /source/blender/compositor/operations/COM_ImageOperation.cpp | |
parent | 36df8cc1e5be695fef4aeafc2c6b9aee92f5d56a (diff) |
Fix T43908: Mask render bug, one pixel black line
This was a regression caused by attempts to fix T42844 and there were
some red-herrings which lead me to the wrong way to fix it. It's some
deeper issue than just interpolation offset, it's mainly how the node
resolution is being mapped to each other.
It could be actually a part of canvas awareness project..
Diffstat (limited to 'source/blender/compositor/operations/COM_ImageOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ImageOperation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp index ff0ffe27b42..2733c483146 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cpp +++ b/source/blender/compositor/operations/COM_ImageOperation.cpp @@ -119,10 +119,10 @@ static void sampleImageAtLocation(ImBuf *ibuf, float x, float y, PixelSampler sa nearest_interpolation_color(ibuf, NULL, color, x, y); break; case COM_PS_BILINEAR: - bilinear_interpolation_color(ibuf, NULL, color, x - 0.5f, y - 0.5f); + bilinear_interpolation_color(ibuf, NULL, color, x, y); break; case COM_PS_BICUBIC: - bicubic_interpolation_color(ibuf, NULL, color, x - 0.5f, y - 0.5f); + bicubic_interpolation_color(ibuf, NULL, color, x, y); break; } } @@ -133,10 +133,10 @@ static void sampleImageAtLocation(ImBuf *ibuf, float x, float y, PixelSampler sa nearest_interpolation_color(ibuf, byte_color, NULL, x, y); break; case COM_PS_BILINEAR: - bilinear_interpolation_color(ibuf, byte_color, NULL, x - 0.5f, y - 0.5f); + bilinear_interpolation_color(ibuf, byte_color, NULL, x, y); break; case COM_PS_BICUBIC: - bicubic_interpolation_color(ibuf, byte_color, NULL, x - 0.5f, y - 0.5f); + bicubic_interpolation_color(ibuf, byte_color, NULL, x, y); break; } rgba_uchar_to_float(color, byte_color); |