diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 22:03:13 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 22:03:13 +0300 |
| commit | 140a83e2023041fed7e48028faf0f1d3e3faf0fc (patch) | |
| tree | f7633b780dc6c3897f0879392fd564feee668b58 /intern/cycles/session/merge.h | |
| parent | 24bd098dbaf8d26511cb416badb8489d1fcfe00b (diff) | |
| parent | 366796bbbe71c246ad436da07a721f2a8deafe5c (diff) | |
Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023
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: |