diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-28 23:22:48 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-28 23:22:48 +0400 |
commit | 2c31bce47f055404218bf6d4d145f29fb81da797 (patch) | |
tree | d7440583af627a06888bcbc37ca20b0ed3192754 /source/blender/windowmanager | |
parent | 841fe45df95cfbd1c5b21465656aabe4de911ae0 (diff) |
Fix #36555: preview render in properties editor did not get cancelled and
restarted fast enough on resizing the editor, especially noticeable with
e.g. luxrender which does a progressive refining render.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 8894be111e7..2a8358f832a 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -386,6 +386,7 @@ struct wmJob *WM_jobs_get(struct wmWindowManager *wm, struct wmWindow *win, void int WM_jobs_test(struct wmWindowManager *wm, void *owner, int job_type); float WM_jobs_progress(struct wmWindowManager *wm, void *owner); char *WM_jobs_name(struct wmWindowManager *wm, void *owner); +void *WM_jobs_customdata(struct wmWindowManager *wm, void *owner); int WM_jobs_is_running(struct wmJob *); void *WM_jobs_customdata_get(struct wmJob *); diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index c6e067dc2f9..188ad251b8a 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -255,6 +255,17 @@ char *WM_jobs_name(wmWindowManager *wm, void *owner) return NULL; } +void *WM_jobs_customdata(wmWindowManager *wm, void *owner) +{ + wmJob *wm_job = wm_job_find(wm, owner, WM_JOB_TYPE_ANY); + + if (wm_job) + return WM_jobs_customdata_get(wm_job); + + return NULL; + +} + int WM_jobs_is_running(wmJob *wm_job) { return wm_job->running; |