Cleanup: Simplify job custom data query API

There were two calls to access job's custom data. One of them
ignored job type, the other one ignored job owner.

Now there is a single function to access job's custom data.
If the job type or owner is not relevant NULL or WM_JOB_TYPE_ANY
can be passes explicitly.

Differential Revision: https://developer.blender.org/D14803

1 files changed, 2 insertions, 13 deletions

diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index 701a93c7e21..b44cf9e48b8 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -280,20 +280,9 @@ const char *WM_jobs_name(const wmWindowManager *wm, const void *owner)
   return NULL;
 }
 
-void *WM_jobs_customdata(wmWindowManager *wm, const void *owner)
+void *WM_jobs_customdata_from_type(wmWindowManager *wm, const void *owner, int job_type)
 {
-  wmJob *wm_job = wm_job_find(wm, owner, WM_JOB_TYPE_ANY);
-
-  if (wm_job) {
-    return WM_jobs_customdata_get(wm_job);
-  }
-
-  return NULL;
-}
-
-void *WM_jobs_customdata_from_type(wmWindowManager *wm, int job_type)
-{
-  wmJob *wm_job = wm_job_find(wm, NULL, job_type);
+  wmJob *wm_job = wm_job_find(wm, owner, job_type);
 
   if (wm_job) {
     return WM_jobs_customdata_get(wm_job);