diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-08-29 17:41:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-29 20:45:58 +0300 |
| commit | 42cff95519f08016127b0249dcd54f2a0a24f079 (patch) | |
| tree | 3065e0ee1484e00a1c8f10ba43a2192481dde739 /intern/cycles | |
| parent | 21acfbe348a433cb6ef5c422b1da232355fa51ab (diff) | |
Cycles: disable Scrambling Distance UI when using Sobol Burley
Contributed by Alaska.
Differential Revision: https://developer.blender.org/D15794
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 | ||||
| -rw-r--r-- | intern/cycles/blender/sync.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 0fead409866..5f17b99858a 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -305,6 +305,7 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel): layout.separator() heading = layout.column(align=True, heading="Scrambling Distance") + heading.active = not cscene.sampling_pattern == 'SOBOL_BURLEY' heading.prop(cscene, "auto_scrambling_distance", text="Automatic") heading.prop(cscene, "preview_scrambling_distance", text="Viewport") heading.prop(cscene, "scrambling_distance", text="Multiplier") diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp index 0d4c1d70180..bf8c4bc6203 100644 --- a/intern/cycles/blender/sync.cpp +++ b/intern/cycles/blender/sync.cpp @@ -385,7 +385,8 @@ void BlenderSync::sync_integrator(BL::ViewLayer &b_view_layer, bool background) /* Only use scrambling distance in the viewport if user wants to. */ bool preview_scrambling_distance = get_boolean(cscene, "preview_scrambling_distance"); - if (preview && !preview_scrambling_distance) { + if ((preview && !preview_scrambling_distance) || + sampling_pattern == SAMPLING_PATTERN_SOBOL_BURLEY) { scrambling_distance = 1.0f; } |