diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-10-31 13:49:04 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-10-31 13:49:04 +0300 |
| commit | fc12a736bbd10e488b701ad18fb70934ea8de01b (patch) | |
| tree | 13532ffffbd7fac27474c01c00702041c45d273f /intern/cycles/device/device.cpp | |
| parent | 14e1dfda4e145fb4d6975fd1531fad149b761bbb (diff) | |
| parent | e0cc3e980999ed97e72b430f0d654b30f60f9313 (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, 0 insertions, 2 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 906c01c619d..428cd4158bc 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -504,7 +504,6 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th info.has_half_images = true; info.has_volume_decoupled = true; - info.bvh_layout_mask = BVH_LAYOUT_ALL; info.has_osl = true; foreach(const DeviceInfo &device, subdevices) { @@ -539,7 +538,6 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th /* Accumulate device info. */ info.has_half_images &= device.has_half_images; info.has_volume_decoupled &= device.has_volume_decoupled; - info.bvh_layout_mask = device.bvh_layout_mask & info.bvh_layout_mask; info.has_osl &= device.has_osl; } |