diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-09-12 14:54:25 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-09-12 14:54:25 +0400 |
| commit | d86f1f67fd3c930085b3599df6d267cba3750b65 (patch) | |
| tree | 8430520021feaddc6555a7278b6c7f17613f30e4 /intern | |
| parent | 08cbfff67c92409c5654446e54c1f97367f494f8 (diff) | |
Cycles UI:
* Non-Progressive UI couldn't be displayed if the device was set to GPU, but User Preferences Device was NULL. (for example when opening .blend file on another computer without GPU capabilities)
* Fix missing update in the Properties editor, when changing compute_device.
This fixes [#32115] OSX and cycles no non-progessive sample input settings appearing in interface.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index bf44a558b1a..7486edf2319 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -53,19 +53,20 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel): scene = context.scene cscene = scene.cycles + device_type = context.user_preferences.system.compute_device_type split = layout.split() col = split.column() sub = col.column() - sub.active = cscene.device == 'CPU' + sub.enabled = (device_type == 'NONE' or cscene.device == 'CPU') sub.prop(cscene, "progressive") sub = col.column(align=True) sub.prop(cscene, "seed") sub.prop(cscene, "sample_clamp") - if cscene.progressive or cscene.device != 'CPU': + if cscene.progressive or (device_type != 'NONE' and cscene.device == 'GPU'): col = split.column() col.label(text="Samples:") sub = col.column(align=True) |