Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-04-05 20:59:19 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-04-05 20:59:19 +0400
commit394a45a64524f417bba0168c236f6f5eccc3a70d (patch)
tree04ba517bbb2020a8de0d3508ca0bb8ee889bcd00 /intern
parent3863e72c735af5a0fbf07cfe6d5f15dbc46d9850 (diff)
Fix #34877: The render status feedback (progress bar) does not take into account specific Renderlayer samples
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_session.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index acda90f0b83..3043d2aa9e9 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -549,7 +549,7 @@ void BlenderSession::get_progress(float& progress, double& total_time)
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));