diff options
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 069305e8a29..434d0085d39 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -35,7 +35,7 @@ class MultiDevice : public Device { public: struct SubDevice { - SubDevice(Device *device_) + explicit SubDevice(Device *device_) : device(device_) {} Device *device; @@ -352,7 +352,7 @@ static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool info.advanced_shading = with_advanced_shading; info.pack_images = false; - info.extended_images = true; + info.has_bindless_textures = true; foreach(DeviceInfo& subinfo, devices) { if(subinfo.type == type) { @@ -376,7 +376,7 @@ static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool if(subinfo.display_device) info.display_device = true; info.pack_images = info.pack_images || subinfo.pack_images; - info.extended_images = info.extended_images && subinfo.extended_images; + info.has_bindless_textures = info.has_bindless_textures && subinfo.has_bindless_textures; num_added++; } } |