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/blender/blender_session.cpp
parent238f3a7d343875992f5b9c2ad657f2bc6f148938 (diff)
Cycles: progress printing in background mode, print finished at the end and
avoid duplicate prints.
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
-rw-r--r--intern/cycles/blender/blender_session.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index c6f016b7971..4fa87815601 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -76,6 +76,10 @@ void BlenderSession::create_session()
SceneParams scene_params = BlenderSync::get_scene_params(b_scene);
SessionParams session_params = BlenderSync::get_session_params(b_scene, background);
+ /* reset status/progress */
+ last_status= "";
+ last_progress= -1.0f;
+
/* create scene */
scene = new Scene(scene_params);
@@ -264,8 +268,14 @@ void BlenderSession::update_status_progress()
if(substatus.size() > 0)
status += " | " + substatus;
- RE_engine_update_stats((RenderEngine*)b_engine.ptr.data, "", status.c_str());
- RE_engine_update_progress((RenderEngine*)b_engine.ptr.data, progress);
+ if(status != last_status) {
+ RE_engine_update_stats((RenderEngine*)b_engine.ptr.data, "", status.c_str());
+ last_status = status;
+ }
+ if(progress != last_progress) {
+ RE_engine_update_progress((RenderEngine*)b_engine.ptr.data, progress);
+ last_progress = progress;
+ }
}
void BlenderSession::tag_update()