diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-10-06 21:11:53 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-10-06 21:11:53 +0400 |
| commit | f7d61831e175ffc506dc0e0d3362b0f40cdce5ae (patch) | |
| tree | 3da833e21389778b83e92cddab6ae8cf795dc3a0 /intern | |
| parent | 0c0fa7dde66269f451d5b6ebe95860dd9e913d5f (diff) | |
Cycles / OSL:
* OSL UI message did not show up when device type was GPU, but User Preferences were None. Also remove experimental check, more convenient for testing.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 8d39b09ab0e..4f4b0371839 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -955,7 +955,7 @@ def draw_device(self, context): elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL': layout.prop(cscene, "device") - if cscene.feature_set == 'EXPERIMENTAL' and cscene.device == 'CPU' and engine.with_osl(): + if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'None'): layout.prop(cscene, "shading_system") |