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.h | |
| 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.h')
| -rw-r--r-- | intern/cycles/device/device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index e9b7cde7a16..0a731969c79 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -79,6 +79,7 @@ class DeviceInfo { bool display_device; /* GPU is used as a display device. */ bool has_half_images; /* Support half-float textures. */ bool has_volume_decoupled; /* Decoupled volume shading. */ + bool has_branched_path; /* Supports branched path tracing. */ bool has_adaptive_stop_per_sample; /* Per-sample adaptive sampling stopping. */ bool has_osl; /* Support Open Shading Language. */ bool use_split_kernel; /* Use split or mega kernel. */ @@ -99,6 +100,7 @@ class DeviceInfo { display_device = false; has_half_images = false; has_volume_decoupled = false; + has_branched_path = true; has_adaptive_stop_per_sample = false; has_osl = false; use_split_kernel = false; |