diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_MultilayerImageOperation.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/operations/COM_MultilayerImageOperation.h')
-rw-r--r-- | source/blender/compositor/operations/COM_MultilayerImageOperation.h | 63 |
1 files changed, 35 insertions, 28 deletions
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h index 948301e2be4..10c475ced4d 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h @@ -16,49 +16,56 @@ * Copyright 2011, Blender Foundation. */ - #ifndef __COM_MULTILAYERIMAGEOPERATION_H__ #define __COM_MULTILAYERIMAGEOPERATION_H__ #include "COM_ImageOperation.h" class MultilayerBaseOperation : public BaseImageOperation { -private: - int m_passId; - int m_view; - RenderLayer *m_renderlayer; -protected: - ImBuf *getImBuf(); -public: - /** - * Constructor - */ - MultilayerBaseOperation(int passindex, int view); - void setRenderLayer(RenderLayer *renderlayer) { this->m_renderlayer = renderlayer; } + private: + int m_passId; + int m_view; + RenderLayer *m_renderlayer; + + protected: + ImBuf *getImBuf(); + + public: + /** + * Constructor + */ + MultilayerBaseOperation(int passindex, int view); + void setRenderLayer(RenderLayer *renderlayer) + { + this->m_renderlayer = renderlayer; + } }; class MultilayerColorOperation : public MultilayerBaseOperation { -public: - MultilayerColorOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) { - this->addOutputSocket(COM_DT_COLOR); - } - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + public: + MultilayerColorOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) + { + this->addOutputSocket(COM_DT_COLOR); + } + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; class MultilayerValueOperation : public MultilayerBaseOperation { -public: - MultilayerValueOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) { - this->addOutputSocket(COM_DT_VALUE); - } - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + public: + MultilayerValueOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) + { + this->addOutputSocket(COM_DT_VALUE); + } + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; class MultilayerVectorOperation : public MultilayerBaseOperation { -public: - MultilayerVectorOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) { - this->addOutputSocket(COM_DT_VECTOR); - } - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + public: + MultilayerVectorOperation(int passindex, int view) : MultilayerBaseOperation(passindex, view) + { + this->addOutputSocket(COM_DT_VECTOR); + } + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; #endif |