Commit: b31b44c223ec4c1ca90e06a003a932aec811790a
Author: Brecht Van Lommel
Date: Fri Mar 6 23:28:33 2020 +0100
Branches: master
https://developer.blender.org/rBb31b44c223ec4c1ca90e06a003a932aec811790a
Fix error in Cycles Optix adaptive sampling after recent cleanup
===================================================================
M intern/cycles/device/device_optix.cpp
===================================================================
diff --git a/intern/cycles/device/device_optix.cpp
b/intern/cycles/device/device_optix.cpp
index 6983c35799d..30d624fdf7c 100644
--- a/intern/cycles/device/device_optix.cpp
+++ b/intern/cycles/device/device_optix.cpp
@@ -672,7 +672,7 @@ class OptiXDevice : public CUDADevice {
// Run the adaptive sampling kernels at selected samples aligned to step
samples.
uint filter_sample = wtile.start_sample + wtile.num_samples - 1;
if (task.adaptive_sampling.use &&
task.adaptive_sampling.need_filter(filter_sample)) {
- adaptive_sampling_filter(&wtile, d_wtile_ptr,
cuda_stream[thread_index]);
+ adaptive_sampling_filter(filter_sample, &wtile, d_wtile_ptr,
cuda_stream[thread_index]);
}
// Wait for launch to finish
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
