[Bf-blender-cvs] [10789c53290] blender-v3.0-release: Cycles: tweak scrambling distance UI grouping, and improve tooltip

[Brecht Van Lommel]

Commit: 10789c53290eb004ba2f254d200dcfff8dbf107e
Author: Brecht Van Lommel
Date:   Wed Oct 27 16:36:56 2021 +0200
Branches: blender-v3.0-release
https://developer.blender.org/rB10789c53290eb004ba2f254d200dcfff8dbf107e

Cycles: tweak scrambling distance UI grouping, and improve tooltip

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

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

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

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index e5853529d1c..1e98e6d0a7c 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -346,7 +346,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         name="Scrambling Distance",
         default=1.0,
         min=0.0, max=1.0,
-        description="Lower values give faster rendering with GPU rendering and less noise with all devices at the cost of possible artifacts if set too low",
+        description="Lower values give faster rendering with GPU rendering and less noise with all devices at the cost of possible artifacts if set too low. Only works when not using adaptive sampling",
     )
     preview_scrambling_distance: BoolProperty(
         name="Scrambling Distance viewport",
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index a0bf6c1758f..0c9179b4ccf 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -289,13 +289,16 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
         col = layout.column(align=True)
         col.active = not (cscene.use_adaptive_sampling and cscene.use_preview_adaptive_sampling)
         col.prop(cscene, "sampling_pattern", text="Pattern")
+
+        layout.separator()
+
         col = layout.column(align=True)
         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 = not cscene.use_preview_adaptive_sampling
-        col.prop(cscene, "preview_scrambling_distance", text="Viewport Scrambling Distance")
+        col.prop(cscene, "scrambling_distance", text="Scrambling Distance")
+        col.prop(cscene, "adaptive_scrambling_distance", text="Adaptive")
+        sub = col.row(align=True)
+        sub.active = not cscene.use_preview_adaptive_sampling
+        sub.prop(cscene, "preview_scrambling_distance", text="Viewport")
 
         layout.separator()