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:
authorAlaska <Alaska>2021-10-27 15:34:04 +0300
committerWilliam Leeson <william@blender.org>2021-10-27 16:58:39 +0300
commit974002743e1fda0823a8101f92e8155a9baf1f21 (patch)
treebc642a1a4ce5b91ea706d86adc99bd72bd496e28 /intern/cycles/blender/addon/ui.py
parent0d6f2cb303991d74404aa30d2f33ef52cb9993fd (diff)
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
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
-rw-r--r--intern/cycles/blender/addon/ui.py6
1 files changed, 3 insertions, 3 deletions
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()