diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-01-20 15:03:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-20 16:59:23 +0300 |
| commit | 10d2cbfa369a512730a53192ccfe2473c9d96035 (patch) | |
| tree | 21fb6b0e43a092b4e947b5ab5c9e503252dc8556 /intern/cycles/device/device.cpp | |
| parent | 1451f7d09322dbe8596c98a2cf02712097f2a879 (diff) | |
Fix T84872: OptiX GPU + CPU rendering uses branched path samples
Branched path tracing is not supported for OptiX, and it would still use the
number of AA samples from there when branched path was enabled by the user
earlier but auto disabled and hidden in the UI when using OptiX.
Ref D10159
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 1efd628b79b..94732cd1855 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -620,6 +620,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo> &subdevices, info.has_half_images = true; info.has_volume_decoupled = true; + info.has_branched_path = true; info.has_adaptive_stop_per_sample = true; info.has_osl = true; info.has_profiling = true; @@ -665,6 +666,7 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo> &subdevices, /* Accumulate device info. */ info.has_half_images &= device.has_half_images; info.has_volume_decoupled &= device.has_volume_decoupled; + info.has_branched_path &= device.has_branched_path; info.has_adaptive_stop_per_sample &= device.has_adaptive_stop_per_sample; info.has_osl &= device.has_osl; info.has_profiling &= device.has_profiling; |