diff options
author | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
---|---|---|
committer | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
commit | dad3574a8c0b673efa9d7f7c890d9562e3f6a267 (patch) | |
tree | 84dff4a90c34a44744c329de21a999289f9d209a /intern/cycles/session/merge.h | |
parent | e9260afa93068d0181de6e3223f65e7bb016aecc (diff) | |
parent | dc8a1d38b73420428f9fb878386b99ebb69dd841 (diff) |
Merge branch 'master' into soc-2022-many-lights-sampling
Diffstat (limited to 'intern/cycles/session/merge.h')
-rw-r--r-- | intern/cycles/session/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/session/merge.h b/intern/cycles/session/merge.h index 702ca5c3eb8..d8a4f04a27b 100644 --- a/intern/cycles/session/merge.h +++ b/intern/cycles/session/merge.h @@ -9,7 +9,7 @@ CCL_NAMESPACE_BEGIN -/* Merge OpenEXR multilayer renders. */ +/* Merge OpenEXR multi-layer renders. */ class ImageMerger { public: |