diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-05-17 21:18:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-05-17 21:18:39 +0300 |
| commit | 542b8da8315eabe4e8817255b82545b3b431c970 (patch) | |
| tree | 12f3e4dd5fad220cfa6ff4f904715c0b5fde70a6 /intern/cycles/blender/addon | |
| parent | 1b0ecb2f891e256eabea9f71575aea207fbee08f (diff) | |
| parent | 85be72c1cc7317796dcce3ddc6ec2dedd627ff81 (diff) | |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'intern/cycles/blender/addon')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 9aea7725810..ce93bd96bd5 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -725,7 +725,7 @@ class CYCLES_RENDER_PT_performance_tiles(CyclesButtonsPanel, Panel): col.prop(cscene, "tile_order", text="Order") sub = col.column() - sub.active = not rd.use_save_buffers + sub.active = not rd.use_save_buffers and not cscene.use_adaptive_sampling sub.prop(cscene, "use_progressive_refine") |