diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2019-03-20 14:51:32 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2019-03-20 14:51:32 +0300 |
| commit | 69fb859909c8e99a8e5e9e06607992d5b9a41473 (patch) | |
| tree | 21e92f04ff583dedac6d5f6a3320c230d9291605 /intern/cycles/blender | |
| parent | ef09aff61cdc4dc940a022c9e0c7c0ad9519780f (diff) | |
| parent | 63cb789551537d8311f9f57e34876c11d692c6b5 (diff) | |
Merge branch 'blender2.7' of git.blender.org:blender
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/addon/operators.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/operators.py b/intern/cycles/blender/addon/operators.py index b53679bd328..63c61c4799e 100644 --- a/intern/cycles/blender/addon/operators.py +++ b/intern/cycles/blender/addon/operators.py @@ -126,7 +126,7 @@ class CYCLES_OT_denoise_animation(Operator): class CYCLES_OT_merge_images(Operator): "Combine OpenEXR multilayer images rendered with different sample" \ - "ranges into one image with reduced noise." + "ranges into one image with reduced noise" bl_idname = "cycles.merge_images" bl_label = "Merge Images" |