Merging r39251 through r39311 from trunk into soc-2011-tomato
[blender-staging.git] / source / blender / windowmanager / WM_api.h
index d8c6933a93dfd2b9e7b34cea831c0931a168af6b..9805703d7edf815e239418ab984864d754c9e1a3 100644 (file)
@@ -299,6 +299,8 @@ int                 WM_jobs_test(struct wmWindowManager *wm, void *owner);
 float          WM_jobs_progress(struct wmWindowManager *wm, void *owner);
 char           *WM_jobs_name(struct wmWindowManager *wm, void *owner);
 
+int             WM_jobs_is_running(struct wmJob *);
+void*           WM_jobs_get_customdata(struct wmJob *);
 void           WM_jobs_customdata(struct wmJob *, void *customdata, void (*free)(void *));
 void           WM_jobs_timer(struct wmJob *, double timestep, unsigned int note, unsigned int endnote);
 void           WM_jobs_callbacks(struct wmJob *,