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