diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-05 15:40:51 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-05 15:40:51 +0300 |
| commit | 24ae7b9035ad78c3d030210a497bf20af6b45318 (patch) | |
| tree | 2e56a16a58aaaa8fad2324c1ceb3b192935e77ec /intern/cycles/blender/addon/ui.py | |
| parent | 3758828d339401cefc69406f0b8f9487ee22ecc2 (diff) | |
Cycles: Don't gray out integrator settings when userprefs are set to OpenCL but scene is set to CPU
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -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 70497b66502..9fb0acdb30e 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -151,7 +151,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): row = layout.row() sub = row.row() - sub.active = device_type != 'OPENCL' + sub.active = device_type != 'OPENCL' or use_cpu(context) sub.prop(cscene, "progressive", text="") row.prop(cscene, "use_square_samples") |