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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-05 21:57:26 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-05 21:57:26 +0400
commit7404c1a553662c4dc1468a78b2237cd54c9598a2 (patch)
tree0fe3bc280d2e46024542419c15ec34986d41570d /intern/cycles/blender/blender_session.cpp
parent93ac968db3bc47e3520c662671cf68e86c0f2204 (diff)
Fix another part of #34877: cycles progress status text not showing correct with
per render layer samples in addition to the progress bar. Also fixed job progress bar not working at all on high DPI / retina, was so small the actual progress was not visible.
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
-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 3043d2aa9e9..1f1bb830771 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->tile_manager.state.num_samples;
+ samples_per_tile = session->tile_manager.num_samples;
if(samples_per_tile && tile_total)
progress = ((float)sample / (float)(tile_total * samples_per_tile));