diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-11-10 02:01:37 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-11-10 02:01:37 +0400 |
| commit | 4bcf0358a80180eecacec5e7f663e41e6564e22a (patch) | |
| tree | 63059a0605503d9a73ef0538f31f59eca49d1834 /intern/cycles/blender | |
| parent | 5fab174031ef6aee5c7481195ebd06358164ff12 (diff) | |
Cycles / OSL:
* UI fix for "shading_system" property, own fault from r51120
Diffstat (limited to 'intern/cycles/blender')
| -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 d8d8c11baa6..9ecd0d3e252 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -957,7 +957,7 @@ def draw_device(self, context): elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL': layout.prop(cscene, "device") - if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'None'): + if engine.with_osl() and (cscene.device == 'CPU' or device_type == 'NONE'): layout.prop(cscene, "shading_system") |