Cycles Denoising: Merge all the changes from the version that's being reviewed

No functional changes.

1 files changed, 3 insertions, 7 deletions

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 3ed005a2919..de7e9de6a78 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -519,13 +519,9 @@ void BlenderSession::render()
 		scene->film->denoising_clean_pass = (scene->film->denoising_flags & DENOISING_CLEAN_ALL_PASSES);
 		buffer_params.denoising_clean_pass = scene->film->denoising_clean_pass;
 		session->params.denoising_radius = b_layer_iter->denoising_radius();
-		session->params.denoising_k2 = powf(2.0f, b_layer_iter->denoising_strength() - 1.0f);
-		if(b_layer_iter->denoising_relative_pca()) {
-			session->params.denoising_pca = -powf(10.0f, b_layer_iter->denoising_feature_strength() - 4.0f);
-		}
-		else {
-			session->params.denoising_pca = powf(10.0f, b_layer_iter->denoising_feature_strength() - 1.0f);
-		}
+		session->params.denoising_strength = b_layer_iter->denoising_strength();
+		session->params.denoising_feature_strength = b_layer_iter->denoising_feature_strength();
+		session->params.denoising_relative_pca = b_layer_iter->denoising_relative_pca();
 
 		scene->film->pass_alpha_threshold = b_layer_iter->pass_alpha_threshold();
 		scene->film->tag_passes_update(scene, passes);