From bf54dcc3c952e207e7c8e7596069152307f61ea3 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 7 Jun 2016 16:44:15 +0200
Subject: [PATCH] Fix T48589: Compositor Backdrop crashes Blender

---
 source/blender/compositor/operations/COM_ImageOperation.cpp | 4 ++--
 1 file 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 {