diff options
| author | Patrick Mours <pmours@nvidia.com> | 2020-05-27 16:31:03 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2020-05-27 16:31:03 +0300 |
| commit | 49c295813ba9fd9de3209e50a11e55647c1de654 (patch) | |
| tree | 2b006406199642d0ed666dcac98b2ea138c76f18 /intern/cycles/device | |
| parent | efa4ae17f043f41b2d7d26dc8dfc7a7f90b4acfd (diff) | |
| parent | 28d9368538f93d329573910d080e2f753f91b489 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_optix.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index e839d852127..441fa35f8af 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -924,7 +924,8 @@ class OptiXDevice : public CUDADevice { &rtiles[9].h, &rtiles[9].offset, &rtiles[9].stride, - &task.pass_stride}; + &task.pass_stride, + &rtile.sample}; launch_filter_kernel( "kernel_cuda_filter_convert_from_rgb", rtiles[9].w, rtiles[9].h, output_args); # endif |