[Bf-blender-cvs] [04bcaf0] master: Fix T48580: path / branched path UI grayed out with OpenCL device that is not used.

[Brecht Van Lommel]

Commit: 04bcaf07dc945578353a8675e1e5003d1c325102
Author: Brecht Van Lommel
Date:   Sat Jun 4 23:20:43 2016 +0200
Branches: master
https://developer.blender.org/rB04bcaf07dc945578353a8675e1e5003d1c325102

Fix T48580: path / branched path UI grayed out with OpenCL device that is not used.

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

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

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 6a109c6..0961c34 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -76,9 +76,8 @@ def use_cuda(context):
 
 def use_branched_path(context):
     cscene = context.scene.cycles
-    device_type = context.user_preferences.system.compute_device_type
 
-    return (cscene.progressive == 'BRANCHED_PATH' and device_type != 'OPENCL')
+    return (cscene.progressive == 'BRANCHED_PATH' and not use_opencl(context))
 
 
 def use_sample_all_lights(context):