diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
commit | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch) | |
tree | 47455f2482f6eca0352c10c57482641eec6afb57 /source/blender/compositor/operations/COM_WriteBufferOperation.h | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/operations/COM_WriteBufferOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_WriteBufferOperation.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index ccc20584186..24bfdecd124 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -31,13 +31,13 @@ * @ingroup Operation */ class WriteBufferOperation : public NodeOperation { - MemoryProxy *memoryProxy; - NodeOperation *input; + MemoryProxy *m_memoryProxy; + NodeOperation *m_input; public: WriteBufferOperation(); ~WriteBufferOperation(); int isBufferOperation() { return true; } - MemoryProxy *getMemoryProxy() { return this->memoryProxy; } + MemoryProxy *getMemoryProxy() { return this->m_memoryProxy; } void executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer * inputBuffers[]); const bool isWriteBufferOperation() const { return true; } |