diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 03:45:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 03:45:39 +0300 |
| commit | fc1fd2704a7b1cc448b20ed5cb596784cb764224 (patch) | |
| tree | 2b24db79955d2ac49e0d45d269cec0917a387cdc /intern/cycles/device/device.cpp | |
| parent | 367e61117907bb7507935251ecb7e396a4c91cbc (diff) | |
| parent | bf7e4067663cec0a3b4d3194e89a28aa62b39773 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 60805511951..56649a7e363 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -505,7 +505,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th info.has_fermi_limits = false; info.has_half_images = true; info.has_volume_decoupled = true; - info.has_qbvh = true; + info.bvh_layout_mask = BVH_LAYOUT_ALL; info.has_osl = true; foreach(const DeviceInfo &device, subdevices) { @@ -542,7 +542,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th device.has_fermi_limits; info.has_half_images &= device.has_half_images; info.has_volume_decoupled &= device.has_volume_decoupled; - info.has_qbvh &= device.has_qbvh; + info.bvh_layout_mask = device.bvh_layout_mask & info.bvh_layout_mask; info.has_osl &= device.has_osl; } |