[Bf-blender-cvs] [a0777d82e5] soc-2016-cycles_denoising: Cycles Denoising: Use squared samples for denoising-after-rendering when they're enabled

[Lukas Stockner]

Commit: a0777d82e59e47aeff8ab27c214dce8df9c914fb
Author: Lukas Stockner
Date:   Sun Jan 15 18:24:20 2017 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rBa0777d82e59e47aeff8ab27c214dce8df9c914fb

Cycles Denoising: Use squared samples for denoising-after-rendering when they're enabled

Previously, the setting would be ignored, which lead to extremely overblurred results.

===================================================================

M	intern/cycles/blender/blender_session.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index b98db64eff..67fd505059 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -1363,6 +1363,9 @@ void BlenderSession::denoise(BL::RenderResult& b_rr)
 
 		session->params.half_window = half_window;
 		session->params.samples = get_int(cscene, "samples");
+		if(get_boolean(cscene, "use_square_samples")) {
+			session->params.samples *= session->params.samples;
+		}
 		session->params.filter_strength = (filter_strength == 0.0f)? 1e-3f : copysignf(powf(10.0f, -fabsf(filter_strength)*2.0f), filter_strength);
 		session->params.filter_weight_adjust = powf(2.0f, weight_adjust - 1.0f);
 		session->params.filter_gradient = filter_gradient;