diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
| commit | 6a1d82490e49d1f5d73b5082516b087d44010fb8 (patch) | |
| tree | 0650cce3c1d47db6c5de1f4f2ba05b619c412f09 /source/blender/compositor/operations/COM_ReadBufferOperation.cpp | |
| parent | 7a0ab62d3f65f3b28da2a6ba9916c21132f8ea0d (diff) | |
use m_ prefix for compositor class members (all compositor operations).
Diffstat (limited to 'source/blender/compositor/operations/COM_ReadBufferOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_ReadBufferOperation.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.cpp b/source/blender/compositor/operations/COM_ReadBufferOperation.cpp index 857131950dd..76e6921503e 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.cpp @@ -27,7 +27,7 @@ ReadBufferOperation::ReadBufferOperation() : NodeOperation() { this->addOutputSocket(COM_DT_COLOR); - this->offset = 0; + this->m_offset = 0; } void *ReadBufferOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers) @@ -37,19 +37,21 @@ void *ReadBufferOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryB void ReadBufferOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[]) { - if (this->memoryProxy != NULL) { - WriteBufferOperation *operation = memoryProxy->getWriteBufferOperation(); + if (this->m_memoryProxy != NULL) { + WriteBufferOperation *operation = this->m_memoryProxy->getWriteBufferOperation(); operation->determineResolution(resolution, preferredResolution); operation->setResolution(resolution); /// @todo: may not occur!, but does with blur node - if (memoryProxy->getExecutor()) memoryProxy->getExecutor()->setResolution(resolution); + if (this->m_memoryProxy->getExecutor()) { + this->m_memoryProxy->getExecutor()->setResolution(resolution); + } } } void ReadBufferOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { if (inputBuffers) { - MemoryBuffer *inputBuffer = inputBuffers[this->offset]; + MemoryBuffer *inputBuffer = inputBuffers[this->m_offset]; if (inputBuffer) { if (sampler == COM_PS_NEAREST) { inputBuffer->read(color, x, y); @@ -68,7 +70,7 @@ void ReadBufferOperation::executePixel(float *color, float x, float y, PixelSamp void ReadBufferOperation::executePixel(float *color, float x, float y, float dx, float dy, MemoryBuffer *inputBuffers[]) { - MemoryBuffer *inputBuffer = inputBuffers[this->offset]; + MemoryBuffer *inputBuffer = inputBuffers[this->m_offset]; if (inputBuffer) { inputBuffer->readEWA(color, x, y, dx, dy); } @@ -85,8 +87,8 @@ bool ReadBufferOperation::determineDependingAreaOfInterest(rcti *input, ReadBuff void ReadBufferOperation::readResolutionFromWriteBuffer() { - if (this->memoryProxy != NULL) { - WriteBufferOperation *operation = memoryProxy->getWriteBufferOperation(); + if (this->m_memoryProxy != NULL) { + WriteBufferOperation *operation = this->m_memoryProxy->getWriteBufferOperation(); this->setWidth(operation->getWidth()); this->setHeight(operation->getHeight()); } |