diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-08-17 20:54:52 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-08-17 20:54:52 +0400 |
| commit | 931ffbedaa3e76a6ebec3df2af22176e504158db (patch) | |
| tree | 38bf9622f9fbc7750acff7baafd6b75fa20d9003 /source/blender/editors/screen | |
| parent | 2a9e6b72373af872cbcff06b80d1c3b4fd59952c (diff) | |
2.5
Stablity commit: on render, all running jobs are stopped now (previews,
composite, screencast). First render has to be more threadsafe, to allow
multiple renders simulatenously.
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 3318101dd99..b591c6e6856 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2885,10 +2885,13 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) RenderJob *rj; Image *ima; - /* only one job at a time */ + /* only one render job at a time */ if(WM_jobs_test(CTX_wm_manager(C), scene)) return OPERATOR_CANCELLED; + /* stop all running jobs, currently previews frustrate Render */ + WM_jobs_stop_all(CTX_wm_manager(C)); + /* handle UI stuff */ WM_cursor_wait(1); |