diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
| commit | b308e613126f8c89e954705aa512a3ef6a1f551d (patch) | |
| tree | 4a875450b2ba9766fbdf4914e8cb003e8132497c /source/blender/windowmanager | |
| parent | 98bdf0274b1052efe25b6216f488d2a40fa43d1c (diff) | |
| parent | cda5d1769d71832a6b04ed6c91bac101c482e5f7 (diff) | |
svn merge ^/trunk/blender -r43220:43278 --accept postpone
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 43ed2b3b2b9..4107356ca0e 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -282,7 +282,7 @@ void wm_event_do_notifiers(bContext *C) /* combine datamasks so 1 win doesn't disable UV's in another [#26448] */ for(win= wm->windows.first; win; win= win->next) { - win_combine_v3d_datamask |= ED_viewedit_datamask(win->screen); + win_combine_v3d_datamask |= ED_view3d_screen_datamask(win->screen); } /* cached: editor refresh callbacks now, they get context */ diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 0cc0d79b292..a81bfaacae7 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -60,6 +60,7 @@ #include "BKE_packedFile.h" #include "BKE_sequencer.h" /* free seq clipboard */ #include "BKE_material.h" /* clear_matcopybuf */ +#include "BKE_tracking.h" /* free tracking clipboard */ #include "BLI_listbase.h" #include "BLI_string.h" @@ -376,6 +377,7 @@ void WM_exit_ext(bContext *C, const short do_python) wm_free_reports(C); /* before free_blender! - since the ListBases get freed there */ seq_free_clipboard(); /* sequencer.c */ + BKE_tracking_free_clipboard(); free_blender(); /* blender.c, does entire library and spacetypes */ // free_matcopybuf(); 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 */ |