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>2011-10-30 14:12:34 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-10-30 14:12:34 +0400
commitbb379c06e914c0a38910343fbee9595fe1dac2c3 (patch)
tree27047c1a76786be6319e1d197d3a978801363509 /intern/cycles/render/session.cpp
parent238f3a7d343875992f5b9c2ad657f2bc6f148938 (diff)
Cycles: progress printing in background mode, print finished at the end and
avoid duplicate prints.
Diffstat (limited to 'intern/cycles/render/session.cpp')
-rw-r--r--intern/cycles/render/session.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 50f7017bacf..2deb83674cc 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -170,8 +170,10 @@ void Session::run_gpu()
if(params.background) {
/* if no work left and in background mode, we can stop immediately */
- if(no_tiles)
+ if(no_tiles) {
+ progress.set_status("Finished");
break;
+ }
}
else {
/* if in interactive mode, and we are either paused or done for now,
@@ -305,8 +307,10 @@ void Session::run_cpu()
if(params.background) {
/* if no work left and in background mode, we can stop immediately */
- if(no_tiles)
+ if(no_tiles) {
+ progress.set_status("Finished");
break;
+ }
}
else {
/* if in interactive mode, and we are either paused or done for now,