archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfix #4561

Browse Source 
Sequence renders, calling scenes with compositing, didn't execute composite
correctly. Confusement caused by the rule that a "Render" handle has same
name as Scene, which gives conflict for the case when a Scene has
sequencing with Scene strips with its own scene in it.

The previous solution for that conflict caused composite not to work. This
commit solves that, but it is still hackish. Main reason is the still
bad global G.scene, in use by compositor.
This commit is contained in:
Ton Roosendaal
2006-07-02 09:56:41 +00:00
parent 348a4c03c6
commit 5e30fb119c
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/src/sequence.c
View File

@@ -891,19 +891,23 @@ static void do_build_seq_ibuf(Sequence * seq, int cfra)
Scene *sce= seq->scene, *oldsce= G.scene;
Render *re;
RenderResult rres;
int doseq;
int doseq, rendering= G.rendering;
char scenename[64];
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.
/* Hack! This function can be called from do_render_seq(), in that case
the seq->scene can already have a Render initialized with same name,
so we have to use a default name. (compositor uses G.scene name to
find render).
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(sce->id.name);
if(rendering) {
BLI_strncpy(scenename, sce->id.name+2, 64);
strcpy(sce->id.name+2, " do_build_seq_ibuf");
}
re= RE_NewRender(sce->id.name);
/* prevent eternal loop */
doseq= sce->r.scemode & R_DOSEQ;
@@ -916,6 +920,11 @@ static void do_build_seq_ibuf(Sequence * seq, int cfra)
RE_BlenderFrame(re, sce, seq->sfra + se->nr);
if(sce!=oldsce) set_scene_bg(oldsce);
/* UGLY WARNING, it is set to zero in RE_BlenderFrame */
G.rendering= rendering;
if(rendering)
BLI_strncpy(sce->id.name+2, scenename, 64);
RE_GetResultImage(re, &rres);
if(rres.rectf) {