[Bf-blender-cvs] [91e1376b] soc-2016-cycles_denoising: Cycles: Fix progress calculation while denoising after rendering

[Lukas Stockner]

Commit: 91e1376bf9049345baec1fc9206ffa0e3f9cb8f0
Author: Lukas Stockner
Date:   Sat Nov 26 03:29:48 2016 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB91e1376bf9049345baec1fc9206ffa0e3f9cb8f0

Cycles: Fix progress calculation while denoising after rendering

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

M	intern/cycles/render/tile.cpp

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

diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp
index 18e8e5b..55460be 100644
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@ -502,6 +502,10 @@ bool TileManager::next()
 
 int TileManager::get_num_effective_samples()
 {
+	if(only_denoise) {
+		return 1;
+	}
+
 	return (range_num_samples == -1) ? num_samples
 	                                 : range_num_samples;
 }