[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50357] trunk/blender/source/blender/ editors/interface/interface_templates.c: Fix regression introduced in recent jobs system refactoring

Sergey Sharybin sergey.vfx at gmail.com
Mon Sep 3 18:05:38 CEST 2012


Revision: 50357
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50357
Author:   nazgul
Date:     2012-09-03 16:05:37 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Fix regression introduced in recent jobs system refactoring

Fluid simulation job progress wasn't displayed anymore.

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-09-03 14:37:34 UTC (rev 50356)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2012-09-03 16:05:37 UTC (rev 50357)
@@ -2557,6 +2557,7 @@
 #define B_STOPCOMPO     4
 #define B_STOPSEQ       5
 #define B_STOPCLIP      6
+#define B_STOPOTHER     7
 
 static void do_running_jobs(bContext *C, void *UNUSED(arg), int event)
 {
@@ -2579,6 +2580,9 @@
 		case B_STOPCLIP:
 			WM_jobs_stop(CTX_wm_manager(C), CTX_wm_area(C), NULL);
 			break;
+		case B_STOPOTHER:
+			G.is_break = TRUE;
+			break;
 	}
 }
 
@@ -2618,6 +2622,10 @@
 				handle_event = B_STOPCOMPO;
 				break;
 			}
+			else if (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY)) {
+				handle_event = B_STOPOTHER;
+				break;
+			}
 		}
 		owner = scene;
 	}




More information about the Bf-blender-cvs mailing list