Fix regression introduced in recent jobs system refactoring

Fluid simulation job progress wasn't displayed anymore.
This commit is contained in:
2012-09-03 16:05:37 +00:00
parent 5c2d9022d9
commit e58548706f

View File

@@ -2557,6 +2557,7 @@ void uiTemplateOperatorSearch(uiLayout *layout)
#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 @@ static void do_running_jobs(bContext *C, void *UNUSED(arg), int event)
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 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
handle_event = B_STOPCOMPO;
break;
}
else if (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY)) {
handle_event = B_STOPOTHER;
break;
}
}
owner = scene;
}