[Bf-blender-cvs] [306acb7dda] master: Fix T50687: Cycles baking time estimate and progress bar doesn't work / progress when baking with high samples

[Sergey Sharybin]

Commit: 306acb7ddaa541fe8316c1c12eb6abd004876a01
Author: Sergey Sharybin
Date:   Thu Feb 16 17:15:08 2017 +0100
Branches: master
https://developer.blender.org/rB306acb7ddaa541fe8316c1c12eb6abd004876a01

Fix T50687: Cycles baking time estimate and progress bar doesn't work / progress when baking with high samples

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

M	intern/cycles/render/bake.h

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

diff --git a/intern/cycles/render/bake.h b/intern/cycles/render/bake.h
index 25f5eb3c89..aed9c5a8e7 100644
--- a/intern/cycles/render/bake.h
+++ b/intern/cycles/render/bake.h
@@ -73,7 +73,7 @@ public:
 
 	bool need_update;
 
-	int total_pixel_samples;
+	size_t total_pixel_samples;
 
 private:
 	BakeData *m_bake_data;