diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-01 13:48:03 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-01 13:48:03 +0300 |
commit | d35969a74ff7a71fc0ca233ae65a2f1c47eb9a25 (patch) | |
tree | 7d12896c3a481c9d0f43f5708624b6a7cddf204e /source/blender/windowmanager/WM_api.h | |
parent | efe2247e3cdb1006a5b1d87d76a96dc6a63ad12c (diff) | |
parent | 229c0580e2915b2dc349069ee7094d322408641f (diff) |
Merge branch 'master' into geometry-nodes-unnamed-attributes
Diffstat (limited to 'source/blender/windowmanager/WM_api.h')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index f3c4cb93e7d..319683c8d8e 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -775,20 +775,20 @@ enum { struct wmJob *WM_jobs_get(struct wmWindowManager *wm, struct wmWindow *win, - void *owner, + const void *owner, const char *name, int flag, int job_type); -bool 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); -double WM_jobs_starttime(struct wmWindowManager *wm, void *owner); -void *WM_jobs_customdata(struct wmWindowManager *wm, void *owner); +bool WM_jobs_test(const struct wmWindowManager *wm, const void *owner, int job_type); +float WM_jobs_progress(const struct wmWindowManager *wm, const void *owner); +const char *WM_jobs_name(const struct wmWindowManager *wm, const void *owner); +double WM_jobs_starttime(const struct wmWindowManager *wm, const void *owner); +void *WM_jobs_customdata(struct wmWindowManager *wm, const void *owner); void *WM_jobs_customdata_from_type(struct wmWindowManager *wm, int job_type); -bool WM_jobs_is_running(struct wmJob *); -bool WM_jobs_is_stopped(wmWindowManager *wm, void *owner); +bool WM_jobs_is_running(const struct wmJob *wm_job); +bool WM_jobs_is_stopped(const wmWindowManager *wm, const void *owner); void *WM_jobs_customdata_get(struct wmJob *); void WM_jobs_customdata_set(struct wmJob *, void *customdata, void (*free)(void *)); void WM_jobs_timer(struct wmJob *, double timestep, unsigned int note, unsigned int endnote); @@ -805,15 +805,15 @@ void WM_jobs_callbacks(struct wmJob *, void (*endjob)(void *)); void WM_jobs_start(struct wmWindowManager *wm, struct wmJob *); -void WM_jobs_stop(struct wmWindowManager *wm, void *owner, void *startjob); +void WM_jobs_stop(struct wmWindowManager *wm, const void *owner, void *startjob); void WM_jobs_kill(struct wmWindowManager *wm, void *owner, void (*)(void *, short int *, short int *, float *)); void WM_jobs_kill_all(struct wmWindowManager *wm); -void WM_jobs_kill_all_except(struct wmWindowManager *wm, void *owner); -void WM_jobs_kill_type(struct wmWindowManager *wm, void *owner, int job_type); +void WM_jobs_kill_all_except(struct wmWindowManager *wm, const void *owner); +void WM_jobs_kill_type(struct wmWindowManager *wm, const void *owner, int job_type); -bool WM_jobs_has_running(struct wmWindowManager *wm); +bool WM_jobs_has_running(const struct wmWindowManager *wm); void WM_job_main_thread_lock_acquire(struct wmJob *job); void WM_job_main_thread_lock_release(struct wmJob *job); |