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_SplitViewerOperation.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_SplitViewerOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_SplitViewerOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp index 00f854b2ba9..6236a666260 100644 --- a/source/blender/compositor/operations/COM_SplitViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_SplitViewerOperation.cpp @@ -60,7 +60,7 @@ void SplitViewerOperation::deinitExecution() } -void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers) +void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber) { float *buffer = this->m_outputBuffer; unsigned char *bufferDisplay = this->m_outputBufferDisplay; @@ -80,10 +80,10 @@ void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me float srgb[4]; image1 = this->m_xSplit ? x > perc : y > perc; if (image1) { - this->m_image1Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers); + this->m_image1Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, NULL); } else { - this->m_image2Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers); + this->m_image2Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, NULL); } /// @todo: linear conversion only when scene color management is selected, also check predivide. if (this->m_doColorManagement) { |