[Bf-blender-cvs] [4ccd96f1a43] master: Cycles: rename viewport denoise Fastest option to Automatic and extend tooltip

Brecht Van Lommel noreply at git.blender.org
Fri Jul 3 12:42:56 CEST 2020


Commit: 4ccd96f1a43c145657eb198cd8dbd00b7ca79799
Author: Brecht Van Lommel
Date:   Thu Jul 2 11:15:26 2020 +0200
Branches: master
https://developer.blender.org/rB4ccd96f1a43c145657eb198cd8dbd00b7ca79799

Cycles: rename viewport denoise Fastest option to Automatic and extend tooltip

===================================================================

M	intern/cycles/blender/addon/properties.py

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 840efb65d96..da706451f88 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -196,14 +196,11 @@ def enum_preview_denoiser(self, context):
     optix_items = enum_optix_denoiser(self, context)
     oidn_items = enum_openimagedenoise_denoiser(self, context)
 
-    if len(optix_items):
-        auto_label = "Fastest (Optix)"
-    elif len(oidn_items):
-        auto_label = "Fastest (OpenImageDenoise)"
+    if len(optix_items) or len(oidn_items):
+        items = [('AUTO', "Automatic", "Use the fastest available denoiser for viewport rendering (OptiX if available, OpenImageDenoise otherwise)", 0)]
     else:
-        auto_label = "None"
+        items = [('AUTO', "None", "Blender was compiled without a viewport denoiser", 0)]
 
-    items = [('AUTO', auto_label, "Use the fastest available denoiser for viewport rendering", 0)]
     items += optix_items
     items += oidn_items
     return items



More information about the Bf-blender-cvs mailing list