diff options
author | Ton Roosendaal <ton@blender.org> | 2006-06-24 00:11:02 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-06-24 00:11:02 +0400 |
commit | ad37091594f909ae7b90d5cf430e27252b4b0571 (patch) | |
tree | 9d6d31caa99c7b0c95ad47a39f601f9f6211c345 /source/blender/src/sequence.c | |
parent | a1e77e239429c4e34b2509152af0efffef5d59e9 (diff) |
bugfix #4431
Sequence render: when a Scene strip renders from within the UI (because
the sequencer preview option demands so), the render-result for this
rendering was not stored or accessible for redraws in render window.
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r-- | source/blender/src/sequence.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 7dd27c9abc7..a11c018dc0e 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -889,12 +889,22 @@ static void do_build_seq_ibuf(Sequence * seq, int cfra) else if(seq->type==SEQ_SCENE && se->ibuf==NULL && seq->scene) { // scene can be NULL after deletions int oldcfra = CFRA; Scene *sce= seq->scene, *oldsce= G.scene; - Render *re= RE_NewRender(" do_build_seq_ibuf"); /* do not use Scene name, can be the same */ + Render *re; RenderResult rres; int doseq; waitcursor(1); + /* This function can be called from do_render_seq(), in that case + the seq->scene can already have a Render, so we use a default name. + However, when called from within the UI (image preview in sequencer) + we do want to use scene Render, that way the render result is defined + for display in render/imagewindow */ + if(G.rendering) + re= RE_NewRender(" do_build_seq_ibuf"); + else + re= RE_NewRender(seq->scene->id.name); + /* prevent eternal loop */ doseq= sce->r.scemode & R_DOSEQ; sce->r.scemode &= ~R_DOSEQ; |