diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-11-26 06:18:48 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-11-26 06:18:48 +0300 |
| commit | 9c779e605cc4d49fde13d6923f91dc79b558d122 (patch) | |
| tree | 7e3999b16d3c73d3bf804f9be3ae2d8415f72d42 /intern/cycles/render/session.cpp | |
| parent | 91e1376bf9049345baec1fc9206ffa0e3f9cb8f0 (diff) | |
Cycles: Properly initialize some denoising-related variables
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 3d3f0a2f0ad..3ef322461c7 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -803,15 +803,14 @@ void Session::run_denoise() kernel_data.film.pass_stride = buffers->params.get_passes_size(); kernel_data.film.pass_denoising = buffers->params.get_denoise_offset(); kernel_data.film.pass_no_denoising = buffers->params.selective_denoising? kernel_data.film.pass_denoising+20 : 0; + kernel_data.film.denoise_cross = 0; kernel_data.film.exposure = 1.0f; kernel_data.film.num_frames = buffers->params.frames; kernel_data.film.prev_frames = params.prev_frames; - if(scene == NULL) { - kernel_data.integrator.filter_strength = params.filter_strength; - kernel_data.integrator.weighting_adjust = params.filter_weight_adjust; - kernel_data.integrator.use_gradients = params.filter_gradient; - kernel_data.integrator.use_nlm_weights = params.filter_nlm; - } + kernel_data.integrator.filter_strength = params.filter_strength; + kernel_data.integrator.weighting_adjust = params.filter_weight_adjust; + kernel_data.integrator.use_gradients = params.filter_gradient; + kernel_data.integrator.use_nlm_weights = params.filter_nlm; device->const_copy_to("__data", &kernel_data, sizeof(kernel_data)); /* Generate tiles. */ |