diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-06-07 17:44:15 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-06-07 17:44:15 +0300 |
commit | bf54dcc3c952e207e7c8e7596069152307f61ea3 (patch) | |
tree | fdcb0a34c8c99b0578db2da8bad4d5b727539812 | |
parent | b595a692c861647f95a39270cf7c123cc830c8c7 (diff) |
Fix T48589: Compositor Backdrop crashes Blender
-rw-r--r-- | source/blender/compositor/operations/COM_ImageOperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp index 624378f2ae9..7d59358831c 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cpp +++ b/source/blender/compositor/operations/COM_ImageOperation.cpp @@ -160,10 +160,10 @@ static void sampleImageAtLocation(ImBuf *ibuf, float x, float y, PixelSampler sa void ImageOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { int ix = x, iy = y; - if (ix < 0 || iy < 0 || ix >= this->m_buffer->x || iy >= this->m_buffer->y) { + if (this->m_imageFloatBuffer == NULL && this->m_imageByteBuffer == NULL) { zero_v4(output); } - else if (this->m_imageFloatBuffer == NULL && this->m_imageByteBuffer == NULL) { + else if (ix < 0 || iy < 0 || ix >= this->m_buffer->x || iy >= this->m_buffer->y) { zero_v4(output); } else { |