[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49916] trunk/blender/source/blender/ editors: use job types when checking for jobs in areas of the code that made assumptions about job types (that could be wrong)

[Campbell Barton]

Revision: 49916
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49916
Author:   campbellbarton
Date:     2012-08-15 10:23:06 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
use job types when checking for jobs in areas of the code that made assumptions about job types (that could be wrong)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/object/object_bake.c
    trunk/blender/source/blender/editors/physics/physics_fluid.c
    trunk/blender/source/blender/editors/render/render_internal.c
    trunk/blender/source/blender/editors/render/render_opengl.c
    trunk/blender/source/blender/editors/space_file/filelist.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2012-08-15 10:12:41 UTC (rev 49915)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2012-08-15 10:23:06 UTC (rev 49916)
@@ -2615,7 +2615,7 @@
 		Scene *scene;
 		/* another scene can be rendering too, for example via compositor */
 		for (scene = CTX_data_main(C)->scene.first; scene; scene = scene->id.next)
-			if (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY))
+			if (WM_jobs_test(wm, scene, WM_JOB_TYPE_RENDER))
 				break;
 		owner = scene;
 		handle_event = B_STOPRENDER;
@@ -2634,7 +2634,7 @@
 		
 		uiLayoutRow(layout, FALSE);
 	}
-	if (WM_jobs_test(wm, screen, WM_JOB_TYPE_ANY))
+	if (WM_jobs_test(wm, screen, WM_JOB_TYPE_SCREENCAST))
 		uiDefIconTextBut(block, BUT, B_STOPCAST, ICON_CANCEL, IFACE_("Capture"), 0, 0, 85, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0,
 		                 TIP_("Stop screencast"));
 	if (screen->animtimer)

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c	2012-08-15 10:12:41 UTC (rev 49915)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2012-08-15 10:23:06 UTC (rev 49916)
@@ -1439,7 +1439,7 @@
 static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), wmEvent *event)
 {
 	/* no running blender, remove handler and pass through */
-	if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_ANY))
+	if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_OBJECT_BAKE_TEXTURE))
 		return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
 
 	/* running render */
@@ -1469,7 +1469,7 @@
 	}
 	else {
 		/* only one render job at a time */
-		if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_ANY))
+		if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_OBJECT_BAKE_TEXTURE))
 			return OPERATOR_CANCELLED;
 
 		if (test_bake_internal(C, op->reports) == 0) {

Modified: trunk/blender/source/blender/editors/physics/physics_fluid.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-08-15 10:12:41 UTC (rev 49915)
+++ trunk/blender/source/blender/editors/physics/physics_fluid.c	2012-08-15 10:23:06 UTC (rev 49916)
@@ -1131,7 +1131,7 @@
 static int fluid_bake_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
 {
 	/* only one bake job at a time */
-	if (WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_ANY))
+	if (WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_OBJECT_SIM_FLUID))
 		return OPERATOR_CANCELLED;
 
 	if (!fluidsimBake(C, op->reports, CTX_data_active_object(C), TRUE))

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2012-08-15 10:12:41 UTC (rev 49915)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2012-08-15 10:23:06 UTC (rev 49916)
@@ -457,7 +457,7 @@
 	Scene *scene = (Scene *) op->customdata;
 
 	/* no running blender, remove handler and pass through */
-	if (0 == WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_ANY)) {
+	if (0 == WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER)) {
 		return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
 	}
 
@@ -489,7 +489,7 @@
 	const char *name;
 	
 	/* only one render job at a time */
-	if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_ANY))
+	if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER))
 		return OPERATOR_CANCELLED;
 
 	if (!RE_is_rendering_allowed(scene, camera_override, op->reports)) {

Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c	2012-08-15 10:12:41 UTC (rev 49915)
+++ trunk/blender/source/blender/editors/render/render_opengl.c	2012-08-15 10:23:06 UTC (rev 49916)
@@ -309,7 +309,7 @@
 	}
 
 	/* only one render job at a time */
-	if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_ANY))
+	if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER))
 		return 0;
 	
 	if (!is_view_context && scene->camera == NULL) {

Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c	2012-08-15 10:12:41 UTC (rev 49915)
+++ trunk/blender/source/blender/editors/space_file/filelist.c	2012-08-15 10:23:06 UTC (rev 49916)
@@ -1385,5 +1385,5 @@
 
 int thumbnails_running(struct FileList *filelist, const struct bContext *C)
 {
-	return WM_jobs_test(CTX_wm_manager(C), filelist, WM_JOB_TYPE_ANY);
+	return WM_jobs_test(CTX_wm_manager(C), filelist, WM_JOB_TYPE_FILESEL_THUMBNAIL);
 }