Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T50628: gray out cycles device menu when no device configured only for GPU Compute.

Browse Source
This commit is contained in:
Brecht Van Lommel
2017-03-12 06:45:29 +01:00
parent 76015f98ae
commit 68ca973f7f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/blender/addon/ui.py
View File

@@ -86,12 +86,10 @@ def use_sample_all_lights(context):
return cscene.sample_all_lights_direct or cscene.sample_all_lights_indirect return cscene.sample_all_lights_direct or cscene.sample_all_lights_indirect
def show_device_selection(context): def show_device_active(context):
type = get_device_type(context) cscene = context.scene.cycles
if type == 'NETWORK': if cscene.device != 'GPU':
return True return True
if not type in {'CUDA', 'OPENCL'}:
return False
return context.user_preferences.addons[__package__].preferences.has_active_device() return context.user_preferences.addons[__package__].preferences.has_active_device()
@@ -1636,7 +1634,7 @@ def draw_device(self, context):
split = layout.split(percentage=1/3) split = layout.split(percentage=1/3)
split.label("Device:") split.label("Device:")
row = split.row() row = split.row()
row.active = show_device_selection(context) row.active = show_device_active(context)
row.prop(cscene, "device", text="") row.prop(cscene, "device", text="")
if engine.with_osl() and use_cpu(context): if engine.with_osl() and use_cpu(context):