diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-20 06:08:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 02:03:59 +0300 |
| commit | ae41f38f78f8c54f92cf34dd88e35948e19aed55 (patch) | |
| tree | 4fb39bf2ed8ca0bece837f93b8e69851b07bf547 /intern/cycles/device/device.cpp | |
| parent | cc96cdd9d49c6029e2abc62d81556e2f22480438 (diff) | |
Code refactor: pass device to scene, check OSL with device info.
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index f31cacd8ec1..16c027e2cb5 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -380,10 +380,13 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th info.has_bindless_textures = true; info.has_volume_decoupled = true; info.has_qbvh = true; + info.has_osl = true; + foreach(const DeviceInfo &device, subdevices) { info.has_bindless_textures &= device.has_bindless_textures; info.has_volume_decoupled &= device.has_volume_decoupled; info.has_qbvh &= device.has_qbvh; + info.has_osl &= device.has_osl; if(device.type == DEVICE_CPU && subdevices.size() > 1) { if(background) { |