[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55821] trunk/blender/intern/cycles/ blender/blender_session.cpp: Fix #34877: The render status feedback ( progress bar) does not take into account specific Renderlayer samples

[Sergey Sharybin]

Revision: 55821
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55821
Author:   nazgul
Date:     2013-04-05 16:59:19 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
Fix #34877: The render status feedback (progress bar) does not take into account specific Renderlayer samples

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_session.cpp

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2013-04-05 16:55:12 UTC (rev 55820)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2013-04-05 16:59:19 UTC (rev 55821)
@@ -549,7 +549,7 @@
 	session->progress.get_tile(tile, total_time, tile_time);
 
 	sample = session->progress.get_sample();
-	samples_per_tile = session->params.samples;
+	samples_per_tile = session->tile_manager.state.num_samples;
 
 	if(samples_per_tile && tile_total)
 		progress = ((float)sample / (float)(tile_total * samples_per_tile));