[Bf-blender-cvs] [8ea09252c8] master: Fix T50517: Rendering expecting time is negative

[Sergey Sharybin]

Commit: 8ea09252c8261c7057a130763c7f44bd45c9f9d2
Author: Sergey Sharybin
Date:   Wed Jan 25 11:18:12 2017 +0100
Branches: master
https://developer.blender.org/rB8ea09252c8261c7057a130763c7f44bd45c9f9d2

Fix T50517: Rendering expecting time is negative

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

M	intern/cycles/render/tile.cpp

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

diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp
index e59d0c843a..a493c3fa1c 100644
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@ -157,7 +157,7 @@ void TileManager::set_samples(int num_samples_)
 			divider >>= 1;
 		}
 
-		state.total_pixel_samples = pixel_samples + get_num_effective_samples() * params.width*params.height;
+		state.total_pixel_samples = pixel_samples + (uint64_t)get_num_effective_samples() * params.width*params.height;
 	}
 }