diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-11 15:37:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-11 15:37:45 +0300 |
| commit | 3f8e26370925c94e07f0bbdd51cddad6601fa125 (patch) | |
| tree | 4a26576894a2f5d65fe56c1ea6c5a024a9a62099 /intern/cycles/blender/blender_session.cpp | |
| parent | 9ec944bbab7a5ba75a526387f8eab52af7f6405e (diff) | |
| parent | c10f5d15c25cbc5ee319835c90d5d2a4dda53497 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index e8a0e6dce39..96fb289c350 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -455,18 +455,14 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_) session->params.run_denoising = run_denoising; session->params.full_denoising = full_denoising; session->params.write_denoising_passes = write_denoising_passes; - session->params.denoising_radius = get_int(crl, "denoising_radius"); - session->params.denoising_strength = get_float(crl, "denoising_strength"); - session->params.denoising_feature_strength = get_float(crl, "denoising_feature_strength"); - session->params.denoising_relative_pca = get_boolean(crl, "denoising_relative_pca"); + session->params.denoising.radius = get_int(crl, "denoising_radius"); + session->params.denoising.strength = get_float(crl, "denoising_strength"); + session->params.denoising.feature_strength = get_float(crl, "denoising_feature_strength"); + session->params.denoising.relative_pca = get_boolean(crl, "denoising_relative_pca"); scene->film->denoising_data_pass = buffer_params.denoising_data_pass; scene->film->denoising_clean_pass = buffer_params.denoising_clean_pass; scene->film->denoising_prefiltered_pass = buffer_params.denoising_prefiltered_pass; - session->params.denoising_radius = get_int(crl, "denoising_radius"); - session->params.denoising_strength = get_float(crl, "denoising_strength"); - session->params.denoising_feature_strength = get_float(crl, "denoising_feature_strength"); - session->params.denoising_relative_pca = get_boolean(crl, "denoising_relative_pca"); scene->film->pass_alpha_threshold = b_view_layer.pass_alpha_threshold(); scene->film->tag_passes_update(scene, passes); |