add wm job types they are not used yet, so this just defines them for new jobs add add argument to search by job type.

3 files changed, 43 insertions, 17 deletions

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 584790b4cda..27507640bdc 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -301,14 +301,34 @@ void		WM_framebuffer_index_set(int index);
 int			WM_framebuffer_to_index(unsigned int col);
 
 			/* threaded Jobs Manager */
-#define WM_JOB_PRIORITY		1
-#define WM_JOB_EXCL_RENDER	2
-#define WM_JOB_PROGRESS		4
-#define WM_JOB_SUSPEND		8
-
-struct wmJob *WM_jobs_get(struct wmWindowManager *wm, struct wmWindow *win, void *owner, const char *name, int flag);
-
-int			WM_jobs_test(struct wmWindowManager *wm, void *owner);
+enum {
+	WM_JOB_PRIORITY     = (1 << 0),
+	WM_JOB_EXCL_RENDER  = (1 << 1),
+	WM_JOB_PROGRESS     = (1 << 2),
+	WM_JOB_SUSPEND      = (1 << 3)
+};
+
+/* identifying jobs by owner alone is unreliable, this isnt saved, order can change */
+enum {
+	WM_JOB_TYPE_ANY = -1,
+	WM_JOB_TYPE_COMPOSITE,
+	WM_JOB_TYPE_RENDER,
+	WM_JOB_TYPE_RENDER_PREVIEW,  /* UI preview */
+	WM_JOB_TYPE_SCREENCAST,
+	WM_JOB_TYPE_OBJECT_SIM_OCEAN,
+	WM_JOB_TYPE_OBJECT_BAKE_TEXTURE,
+	WM_JOB_TYPE_FILESEL_THUMBNAIL,
+	WM_JOB_TYPE_CLIP_BUILD_PROXY,
+	WM_JOB_TYPE_CLIP_TRACK_MARKERS,
+	WM_JOB_TYPE_CLIP_SOLVE_CAMERA,
+	WM_JOB_TYPE_SEQ_BUILD_PROXY,
+	/* add as needed, screencast, seq proxy build
+	 * if having hard coded values is a problem */
+};
+
+struct wmJob *WM_jobs_get(struct wmWindowManager *wm, struct wmWindow *win, void *owner, const char *name, int flag, int job_type);
+
+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);
 
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index ce0c7e13454..feca042d2a6 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -114,7 +114,7 @@ struct wmJob {
 /* internal */
 	void *owner;
 	int flag;
-	short suspended, running, ready, do_update, stop;
+	short suspended, running, ready, do_update, stop, job_type;
 	float progress;
 
 	/* for display in header, identification */
@@ -153,7 +153,7 @@ static wmJob *wm_job_find(wmWindowManager *wm, void *owner, const char *name)
 /* returns current or adds new job, but doesnt run it */
 /* every owner only gets a single job, adding a new one will stop running stop and 
  * when stopped it starts the new one */
-wmJob *WM_jobs_get(wmWindowManager *wm, wmWindow *win, void *owner, const char *name, int flag)
+wmJob *WM_jobs_get(wmWindowManager *wm, wmWindow *win, void *owner, const char *name, int flag, int job_type)
 {
 	wmJob *steve = wm_job_find(wm, owner, name);
 	
@@ -164,6 +164,7 @@ wmJob *WM_jobs_get(wmWindowManager *wm, wmWindow *win, void *owner, const char *
 		steve->win = win;
 		steve->owner = owner;
 		steve->flag = flag;
+		steve->job_type = job_type;
 		BLI_strncpy(steve->name, name, sizeof(steve->name));
 	}
 	
@@ -171,17 +172,22 @@ wmJob *WM_jobs_get(wmWindowManager *wm, wmWindow *win, void *owner, const char *
 }
 
 /* returns true if job runs, for UI (progress) indicators */
-int WM_jobs_test(wmWindowManager *wm, void *owner)
+int WM_jobs_test(wmWindowManager *wm, void *owner, int job_type)
 {
 	wmJob *steve;
 	
 	/* job can be running or about to run (suspended) */
-	for (steve = wm->jobs.first; steve; steve = steve->next)
-		if (steve->owner == owner)
-			if (steve->running || steve->suspended)
-				return 1;
+	for (steve = wm->jobs.first; steve; steve = steve->next) {
+		if (steve->owner == owner) {
+			if (job_type == WM_JOB_TYPE_ANY || (steve->job_type == job_type)) {
+				if (steve->running || steve->suspended) {
+					return TRUE;
+				}
+			}
+		}
+	}
 
-	return 0;
+	return FALSE;
 }
 
 float WM_jobs_progress(wmWindowManager *wm, void *owner)
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 59e0614b18a..a2812d34e61 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -965,7 +965,7 @@ int WM_operator_check_ui_enabled(const bContext *C, const char *idname)
 	wmWindowManager *wm = CTX_wm_manager(C);
 	Scene *scene = CTX_data_scene(C);
 
-	return !(ED_undo_valid(C, idname) == 0 || WM_jobs_test(wm, scene));
+	return !(ED_undo_valid(C, idname) == 0 || WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY));
 }
 
 wmOperator *WM_operator_last_redo(const bContext *C)