Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device.cpp
index 906c01c619dd738d706e769bf6f54f87e9120406..428cd4158bc1430f5c94ad2ceafe8ff49501bd0e 100644 (file)
@@ -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;
        }