From 630d2b649741c9d9f7bc0857054b001eede84a80 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 15 Mar 2022 16:08:10 +0100 Subject: Cycles: allow Adaptive Sampling with Scrambling Distance While the correlation may not work well with adaptive sampling, in practice this appears to work ok in most cases Automatic scrambling distance uses the minimum samples from adaptive sampling, which provides a good default estimate to avoid artifacts. Contributed by Alaska. Differential Revision: https://developer.blender.org/D13325 --- intern/cycles/blender/addon/ui.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'intern/cycles/blender/addon/ui.py') diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 64de1227355..1f50f3da7ae 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -289,11 +289,8 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel): layout.separator() heading = layout.column(align=True, heading="Scrambling Distance") - heading.active = not (cscene.use_adaptive_sampling and cscene.use_preview_adaptive_sampling) heading.prop(cscene, "auto_scrambling_distance", text="Automatic") - sub = heading.row() - sub.active = not cscene.use_preview_adaptive_sampling - sub.prop(cscene, "preview_scrambling_distance", text="Viewport") + heading.prop(cscene, "preview_scrambling_distance", text="Viewport") heading.prop(cscene, "scrambling_distance", text="Multiplier") layout.separator() -- cgit v1.2.3