Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device_multi.cpp
index 587840e551fb0a52a126d53ba3dc2ca37ec3b16a..67f0f88028737b26988b66b836abc6307388f4ea 100644 (file)
@@ -103,6 +103,14 @@ public:
                return devices.front().device->show_samples();
        }
 
+       virtual BVHLayoutMask get_bvh_layout_mask() const {
+               BVHLayoutMask bvh_layout_mask = BVH_LAYOUT_ALL;
+               foreach(const SubDevice& sub_device, devices) {
+                       bvh_layout_mask &= sub_device.device->get_bvh_layout_mask();
+               }
+               return bvh_layout_mask;
+       }
+
        bool load_kernels(const DeviceRequestedFeatures& requested_features)
        {
                foreach(SubDevice& sub, devices)