1 files changed, 14 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_BufferOperation.cc b/source/blender/compositor/intern/COM_BufferOperation.cc
index 8464d01801f..c07a6f01451 100644
--- a/source/blender/compositor/intern/COM_BufferOperation.cc
+++ b/source/blender/compositor/intern/COM_BufferOperation.cc
@@ -23,6 +23,7 @@ namespace blender::compositor {
 BufferOperation::BufferOperation(MemoryBuffer *buffer, DataType data_type)
 {
   buffer_ = buffer;
+  inflated_buffer_ = nullptr;
   /* TODO: Implement a MemoryBuffer get_size() method returning a Size2d type. Shorten following
    * code to: set_resolution(buffer.get_size()) */
   unsigned int resolution[2];
@@ -34,7 +35,19 @@ BufferOperation::BufferOperation(MemoryBuffer *buffer, DataType data_type)
 
 void *BufferOperation::initializeTileData(rcti * /*rect*/)
 {
-  return buffer_;
+  if (buffer_->is_a_single_elem() == false) {
+    return buffer_;
+  }
+
+  if (!inflated_buffer_) {
+    inflated_buffer_ = buffer_->inflate();
+  }
+  return inflated_buffer_;
+}
+
+void BufferOperation::deinitExecution()
+{
+  delete inflated_buffer_;
 }
 
 void BufferOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)