[Bf-blender-cvs] [24ae7b9] master: Cycles: Don't gray out integrator settings when userprefs are set to OpenCL but scene is set to CPU

[Sergey Sharybin]

Commit: 24ae7b9035ad78c3d030210a497bf20af6b45318
Author: Sergey Sharybin
Date:   Fri Feb 5 13:40:51 2016 +0100
Branches: master
https://developer.blender.org/rB24ae7b9035ad78c3d030210a497bf20af6b45318

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

===================================================================

M	intern/cycles/blender/addon/ui.py

===================================================================

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 70497b6..9fb0acd 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")