diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-10 18:24:02 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-10 18:24:02 +0400 |
| commit | 84c6daedd7f4f99aacac5e8da1c37ac91ab048f9 (patch) | |
| tree | 1e121c9cdb6160feed4b595d3bf379ec0fb99c56 /source/blender/windowmanager/intern/wm_jobs.c | |
| parent | d09a73b15958e53288807a56327f9df6a3f7d84a (diff) | |
Fix jobs progress display in taskbar incorrectly flashing on/off with multiple
jobs active.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_jobs.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 2d0d0f92a44..f2ee5a328d6 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -491,6 +491,13 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt) WM_jobs_start(wm, steve); } } + else if(steve->threads.first && !steve->ready) { + if(steve->flag & WM_JOB_PROGRESS) { + /* accumulate global progress for running jobs */ + jobs_progress++; + total_progress += steve->progress; + } + } } /* on file load 'winactive' can be NULL, possibly it should not happen but for now do a NULL check - campbell */ |