Cycles: Don't gray out integrator settings when userprefs are set to OpenCL but scene is set to CPU

2016-02-05 13:40:51 +01:00
parent 3758828d33
commit 24ae7b9035
1 changed files with 1 additions and 1 deletions
--- 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")