Merge branch 'blender2.7'
[blender.git] / intern / cycles / blender / blender_session.cpp
index e8a0e6d..96fb289 100644 (file)
@@ -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);