[Bf-blender-cvs] [0836795a0d6] master: Fix issue with resumable rendering in recent changes.

[Brecht Van Lommel]

Commit: 0836795a0d6967f1c0dc3a5ae84d3e9d30814b0e
Author: Brecht Van Lommel
Date:   Sat Oct 21 20:57:31 2017 +0200
Branches: master
https://developer.blender.org/rB0836795a0d6967f1c0dc3a5ae84d3e9d30814b0e

Fix issue with resumable rendering in recent changes.

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

M	intern/cycles/render/session.cpp
M	intern/cycles/render/tile.cpp

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

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index d9264309273..4642dcfa9a1 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -922,7 +922,7 @@ void Session::update_status_time(bool show_pause, bool show_done)
 void Session::render()
 {
 	/* Clear buffers. */
-	if(buffers && tile_manager.state.sample == 0) {
+	if(buffers && tile_manager.state.sample == tile_manager.range_start_sample) {
 		buffers->zero(device);
 	}
 
diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp
index 2f08288be0d..a388f5dfc8b 100644
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@ -517,7 +517,7 @@ bool TileManager::next()
 
 		state.resolution_divider = pixel_size;
 
-		if(state.sample == 0) {
+		if(state.sample == range_start_sample) {
 			set_tiles();
 		}
 		else {