diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-11 14:45:56 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-11 14:45:56 +0400 |
commit | c25240ad547e579381b8ae4cdb7b7b961d0af2cb (patch) | |
tree | 408cdbff6919db8a8a06658633351e164e3b5ee2 /source/blender/compositor/operations/COM_CompositorOperation.cpp | |
parent | 74625c8d54cf19f4eac4a007cc2a8b3b56f621b2 (diff) |
Compositor read buffers work directly on the memory buffer.
This way we can remove the memoryBuffers parameter in the executePixels,
and (de)initializeTileData methods
Diffstat (limited to 'source/blender/compositor/operations/COM_CompositorOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_CompositorOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 717b6ce76cc..a58f77386ea 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -94,7 +94,7 @@ void CompositorOperation::deinitExecution() } -void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers) +void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber) { float color[8]; // 7 is enough float *buffer = this->m_outputBuffer; @@ -111,9 +111,9 @@ void CompositorOperation::executeRegion(rcti *rect, unsigned int tileNumber, Mem for (y = y1; y < y2 && (!breaked); y++) { for (x = x1; x < x2 && (!breaked); x++) { - this->m_imageInput->read(color, x, y, COM_PS_NEAREST, memoryBuffers); + this->m_imageInput->read(color, x, y, COM_PS_NEAREST, NULL); if (this->m_alphaInput != NULL) { - this->m_alphaInput->read(&(color[3]), x, y, COM_PS_NEAREST, memoryBuffers); + this->m_alphaInput->read(&(color[3]), x, y, COM_PS_NEAREST, NULL); } copy_v4_v4(buffer + offset, color); offset += COM_NUMBER_OF_CHANNELS; |