Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-06-05 00:20:43 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-06-05 00:21:44 +0300
commit04bcaf07dc945578353a8675e1e5003d1c325102 (patch)
tree0b2cecae250e476314a1b0c8c096dd3d37a424ac
parent234801c8dc42f0f24e6f90691451b462942ffe56 (diff)
Fix T48580: path / branched path UI grayed out with OpenCL device that is not used.
-rw-r--r--intern/cycles/blender/addon/ui.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 6a109c60ed1..0961c349fc3 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):