[Bf-blender-cvs] [974002743e1] master: Cycles: Update UI for Scrambling Distance Patch

[Alaska]

Commit: 974002743e1fda0823a8101f92e8155a9baf1f21
Author: Alaska
Date:   Wed Oct 27 14:34:04 2021 +0200
Branches: master
https://developer.blender.org/rB974002743e1fda0823a8101f92e8155a9baf1f21

Cycles: Update UI for Scrambling Distance Patch

The current UI for the Scramble Distance patch is grayed out
depending on different settings that are enabled. However it
didn't make much sense to me so I have updated when the UI is
grayed out to hopefully make more sense to the end user.

Differential Revision: https://developer.blender.org/D12963

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

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

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index dfaae666785..a0bf6c1758f 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -287,14 +287,14 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
         row.prop(cscene, "use_animated_seed", text="", icon='TIME')
 
         col = layout.column(align=True)
-        col.active = not(cscene.use_adaptive_sampling)
+        col.active = not (cscene.use_adaptive_sampling and cscene.use_preview_adaptive_sampling)
         col.prop(cscene, "sampling_pattern", text="Pattern")
         col = layout.column(align=True)
-        col.active = not cscene.use_adaptive_sampling
+        col.active = not (cscene.use_adaptive_sampling and cscene.use_preview_adaptive_sampling)
         col.prop(cscene, "scrambling_distance", text="Scrambling Distance Strength")
         col.prop(cscene, "adaptive_scrambling_distance", text="Adaptive Scrambling Distance")
         col = layout.column(align=True)
-        col.active = ((cscene.scrambling_distance < 1.0) or cscene.adaptive_scrambling_distance) and not cscene.use_adaptive_sampling
+        col.active = not cscene.use_preview_adaptive_sampling
         col.prop(cscene, "preview_scrambling_distance", text="Viewport Scrambling Distance")
 
         layout.separator()