diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-29 12:20:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-29 12:20:53 +0300 |
| commit | 2be098a1a02da30617516d32e6cd1409644c005e (patch) | |
| tree | cdb437a3da41d0b9a28b49dc8a517f0f7cb5c597 /intern | |
| parent | ff3e1fa7609f3371b8a93251ab7b7c53a2227382 (diff) | |
| parent | c2d3bb709044b7a2730b9fb5005657f38eaff6f2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 5c0648a192c..39d918bd70f 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -183,6 +183,8 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): else: sub.label(text="AA Samples:") sub.prop(cscene, "aa_samples", text="Render") + sub.prop(cscene, "preview_aa_samples", text="Preview") + col = split.column() sub = col.column(align=True) sub.label(text="Samples:") |