diff options
| author | Campbell Barton <campbell@blender.org> | 2022-11-10 03:34:43 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-11-10 03:34:43 +0300 |
| commit | baabac5909204000664e675095e0340b4833f67d (patch) | |
| tree | 7048e94ccbcf2592b8b4cfaa00d4ab25705a663c /intern | |
| parent | 7d606ad3b86b4dabfeaa0dc3eecaf2b0d803f46d (diff) | |
| parent | 8140f7f5741d954b95bc3eaade55c213a385e6cd (diff) | |
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/operators.py | 2 | ||||
| -rw-r--r-- | intern/cycles/session/merge.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/operators.py b/intern/cycles/blender/addon/operators.py index ab474cda0ab..3680d11359e 100644 --- a/intern/cycles/blender/addon/operators.py +++ b/intern/cycles/blender/addon/operators.py @@ -114,7 +114,7 @@ class CYCLES_OT_denoise_animation(Operator): class CYCLES_OT_merge_images(Operator): - "Combine OpenEXR multilayer images rendered with different sample " \ + "Combine OpenEXR multi-layer images rendered with different sample " \ "ranges into one image with reduced noise" bl_idname = "cycles.merge_images" bl_label = "Merge Images" 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: |