Merge branch 'blender2.7'

1 files changed, 5 insertions, 5 deletions

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 4b8630af6d1..3283427011e 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -927,9 +927,12 @@ void Session::update_status_time(bool show_pause, bool show_done)
 			 */
 			substatus += string_printf(", Sample %d/%d", progress.get_current_sample(), num_samples);
 		}
-		if(params.run_denoising) {
+		if(params.full_denoising) {
 			substatus += string_printf(", Denoised %d tiles", progress.get_denoised_tiles());
 		}
+		else if(params.run_denoising) {
+			substatus += string_printf(", Prefiltered %d tiles", progress.get_denoised_tiles());
+		}
 	}
 	else if(tile_manager.num_samples == INT_MAX)
 		substatus = string_printf("Path Tracing Sample %d", progressive_sample+1);
@@ -976,10 +979,7 @@ void Session::render()
 	task.passes_size = tile_manager.params.get_passes_size();
 
 	if(params.run_denoising) {
-		task.denoising_radius = params.denoising_radius;
-		task.denoising_strength = params.denoising_strength;
-		task.denoising_feature_strength = params.denoising_feature_strength;
-		task.denoising_relative_pca = params.denoising_relative_pca;
+		task.denoising = params.denoising;
 
 		assert(!scene->film->need_update);
 		task.pass_stride = scene->film->pass_stride;