[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49917] trunk/blender/source/blender/ editors/interface/interface_templates.c: rendering now stops the composite job first, then renders.

Campbell Barton ideasman42 at gmail.com
Wed Aug 15 12:31:52 CEST 2012


Revision: 49917
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49917
Author:   campbellbarton
Date:     2012-08-15 10:31:52 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
rendering now stops the composite job first, then renders.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2012-08-15 10:23:06 UTC (rev 49916)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2012-08-15 10:31:52 UTC (rev 49917)
@@ -2571,7 +2571,7 @@
 			WM_operator_name_call(C, "SCREEN_OT_animation_play", WM_OP_INVOKE_SCREEN, NULL);
 			break;
 		case B_STOPCOMPO:
-			WM_jobs_stop(CTX_wm_manager(C), CTX_wm_area(C), NULL);
+			WM_jobs_stop(CTX_wm_manager(C), CTX_data_scene(C), NULL);
 			break;
 		case B_STOPSEQ:
 			WM_jobs_stop(CTX_wm_manager(C), CTX_wm_area(C), NULL);
@@ -2596,14 +2596,9 @@
 
 	uiBlockSetHandleFunc(block, do_running_jobs, NULL);
 
-	if (sa->spacetype == SPACE_NODE) {
+	if (sa->spacetype == SPACE_SEQ) {
 		if (WM_jobs_test(wm, sa, WM_JOB_TYPE_ANY))
 			owner = sa;
-		handle_event = B_STOPCOMPO;
-	}
-	else if (sa->spacetype == SPACE_SEQ) {
-		if (WM_jobs_test(wm, sa, WM_JOB_TYPE_ANY))
-			owner = sa;
 		handle_event = B_STOPSEQ;
 	}
 	else if (sa->spacetype == SPACE_CLIP) {
@@ -2614,11 +2609,17 @@
 	else {
 		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_RENDER))
+		for (scene = CTX_data_main(C)->scene.first; scene; scene = scene->id.next) {
+			if (WM_jobs_test(wm, scene, WM_JOB_TYPE_RENDER)) {
+				handle_event = B_STOPRENDER;
 				break;
+			}
+			else if (WM_jobs_test(wm, scene, WM_JOB_TYPE_COMPOSITE)) {
+				handle_event = B_STOPCOMPO;
+				break;
+			}
+		}
 		owner = scene;
-		handle_event = B_STOPRENDER;
 	}
 
 	if (owner) {




More information about the Bf-blender-cvs mailing list