diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-29 04:55:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-29 04:55:58 +0300 |
| commit | 9893fee4e6ce5949c8d3274b2746855b3095258f (patch) | |
| tree | 973d8b46af8d83705ecc97c21f12bbb1799af2a3 /intern/cycles/device/device.cpp | |
| parent | 535984a848865c07a39610b32a53432d1a078c59 (diff) | |
| parent | 140f2209b61d637411cfbc22c755703c6220278f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 565f8f5404c..b0ca9e1f0dd 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -505,6 +505,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th info.has_half_images = true; info.has_volume_decoupled = true; info.has_osl = true; + info.has_profiling = true; foreach(const DeviceInfo &device, subdevices) { /* Ensure CPU device does not slow down GPU. */ @@ -539,6 +540,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th info.has_half_images &= device.has_half_images; info.has_volume_decoupled &= device.has_volume_decoupled; info.has_osl &= device.has_osl; + info.has_profiling &= device.has_profiling; } return info; |