Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-11-10 03:34:43 +0300
committerCampbell Barton <campbell@blender.org>2022-11-10 03:34:43 +0300
commitbaabac5909204000664e675095e0340b4833f67d (patch)
tree7048e94ccbcf2592b8b4cfaa00d4ab25705a663c /intern/cycles/blender/addon
parent7d606ad3b86b4dabfeaa0dc3eecaf2b0d803f46d (diff)
parent8140f7f5741d954b95bc3eaade55c213a385e6cd (diff)
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'intern/cycles/blender/addon')
-rw-r--r--intern/cycles/blender/addon/operators.py2
1 files changed, 1 insertions, 1 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"