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 /intern/cycles/render/merge.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 'intern/cycles/render/merge.h')
| -rw-r--r-- | intern/cycles/render/merge.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/render/merge.h b/intern/cycles/render/merge.h index 48900a13c27..87e5d2d4723 100644 --- a/intern/cycles/render/merge.h +++ b/intern/cycles/render/merge.h @@ -25,17 +25,17 @@ CCL_NAMESPACE_BEGIN /* Merge OpenEXR multilayer renders. */ class ImageMerger { -public: - ImageMerger(); - bool run(); + public: + ImageMerger(); + bool run(); - /* Error message after running, in case of failure. */ - string error; + /* Error message after running, in case of failure. */ + string error; - /* List of image filepaths to merge. */ - vector<string> input; - /* Output filepath. */ - string output; + /* List of image filepaths to merge. */ + vector<string> input; + /* Output filepath. */ + string output; }; CCL_NAMESPACE_END |