diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-09-03 16:35:32 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-09-03 16:35:32 +0400 |
| commit | 9fbc1c31496f2ac3d8a7e71ef84cd91353c6c7fb (patch) | |
| tree | fbb0b78401ced432591727aa678a4c80eb778000 /intern | |
| parent | dde5ccb61fe6edc22bb17c8aa81454b526ccadef (diff) | |
* Added back UI switch for the Cycles shading system. Only visible when the feature set is "Experimental".
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 5234db5255e..c30581ecd40 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -920,6 +920,9 @@ def draw_device(self, context): layout.prop(cscene, "device") 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(): + layout.prop(cscene, "shading_system") def draw_pause(self, context): |