diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-03-15 18:08:10 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-03-15 18:12:13 +0300 |
commit | 630d2b649741c9d9f7bc0857054b001eede84a80 (patch) | |
tree | aa006448f367c426d23a71a98b0f5d4a13a3c12a /intern/cycles/blender/addon | |
parent | f9d3632cde17b13281d387c570755aa78a14b7d6 (diff) |
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
Diffstat (limited to 'intern/cycles/blender/addon')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 4 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index a0741c0633d..4f78fbfc9e7 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -349,7 +349,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): name="Scrambling Distance", default=1.0, min=0.0, soft_max=1.0, - description="Reduce randomization between pixels to improve GPU rendering performance, at the cost of possible rendering artifacts if set too low. Only works when not using adaptive sampling", + description="Reduce randomization between pixels to improve GPU rendering performance, at the cost of possible rendering artifacts if set too low", ) preview_scrambling_distance: BoolProperty( name="Scrambling Distance viewport", @@ -360,7 +360,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): auto_scrambling_distance: BoolProperty( name="Automatic Scrambling Distance", default=False, - description="Automatically reduce the randomization between pixels to improve GPU rendering performance, at the cost of possible rendering artifacts. Only works when not using adaptive sampling", + description="Automatically reduce the randomization between pixels to improve GPU rendering performance, at the cost of possible rendering artifacts", ) use_layer_samples: EnumProperty( 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() |