Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device.cpp
index 565f8f5404c8a77453cfa6055f448de83ab0b385..b0ca9e1f0dde66e389d2735449585ac9bf159a58 100644 (file)
@@ -505,6 +505,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th
        info.has_half_images = true;
        info.has_volume_decoupled = true;
        info.has_osl = true;
+       info.has_profiling = true;
 
        foreach(const DeviceInfo &device, subdevices) {
                /* Ensure CPU device does not slow down GPU. */
@@ -539,6 +540,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo>& subdevices, int th
                info.has_half_images &= device.has_half_images;
                info.has_volume_decoupled &= device.has_volume_decoupled;
                info.has_osl &= device.has_osl;
+               info.has_profiling &= device.has_profiling;
        }
 
        return info;