Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2012-07-11 14:45:56 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2012-07-11 14:45:56 +0400
commitc25240ad547e579381b8ae4cdb7b7b961d0af2cb (patch)
tree408cdbff6919db8a8a06658633351e164e3b5ee2 /source/blender/compositor/operations/COM_ViewerOperation.cpp
parent74625c8d54cf19f4eac4a007cc2a8b3b56f621b2 (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_ViewerOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_ViewerOperation.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp
index 9278ddd6ead..fdf9c49b112 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp
@@ -64,7 +64,7 @@ void ViewerOperation::deinitExecution()
}
-void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
+void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber)
{
float *buffer = this->m_outputBuffer;
unsigned char *bufferDisplay = this->m_outputBufferDisplay;
@@ -82,9 +82,9 @@ void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryB
for (y = y1; y < y2 && (!breaked); y++) {
for (x = x1; x < x2; x++) {
- this->m_imageInput->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers);
+ this->m_imageInput->read(&(buffer[offset]), x, y, COM_PS_NEAREST, NULL);
if (this->m_alphaInput != NULL) {
- this->m_alphaInput->read(alpha, x, y, COM_PS_NEAREST, memoryBuffers);
+ this->m_alphaInput->read(alpha, x, y, COM_PS_NEAREST, NULL);
buffer[offset + 3] = alpha[0];
}
/// @todo: linear conversion only when scene color management is selected, also check predivide.