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:
authorBrecht Van Lommel <brecht@blender.org>2021-11-22 17:56:51 +0300
committerHarley Acheson <harley.acheson@gmail.com>2021-11-22 21:44:34 +0300
commitbfff9ca5f13dde6e90182297726c8b863ef97ff7 (patch)
tree0393ac2747b8b8e148b4468005af76e87bd9f2b9 /intern/cycles/blender/addon/ui.py
parentcc6bcb53b21ec4dd73490345548fb506d66bd3a5 (diff)
Fix confusing new Cycles UI terminology
* Rename "Auto Tiles" to "Use Tiling", it's not really automatic and confusing with the old auto tile size add-on. * Rename "Adaptive" scrambling distance to "Automatic", to avoid confusion with adaptive sampling.
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
-rw-r--r--intern/cycles/blender/addon/ui.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 635d92c2629..57741447608 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -295,13 +295,13 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel):
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")
- col.prop(cscene, "adaptive_scrambling_distance", text="Adaptive")
- sub = col.row(align=True)
+ 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, "scrambling_distance", text="Multiplier")
layout.separator()