bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix part of #25040: rendering multiple scenes from compositing nodes didn't

Browse Source 
restore current scene properly afterwards.
This commit is contained in:
Brecht Van Lommel 2010-12-05 10:14:34 +00:00
parent 260687d9b1
commit 0400745c0a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/render/intern/source/pipeline.c
View File

@ -2205,6 +2205,7 @@ static void ntree_render_scenes(Render *re)
{
bNode *node;
int cfra= re->scene->r.cfra;
int restore_scene= 0;
if(re->scene->nodetree==NULL) return;
@ -2216,12 +2217,19 @@ static void ntree_render_scenes(Render *re)
if(node->type==CMP_NODE_R_LAYERS) {
if(node->id && node->id != (ID *)re->scene) {
if(node->id->flag & LIB_DOIT) {
render_scene(re, (Scene *)node->id, cfra);
Scene *scene = (Scene*)node->id;
render_scene(re, scene, cfra);
restore_scene= (scene != re->scene);
node->id->flag &= ~LIB_DOIT;
}
}
}
}
/* restore scene if we rendered another last */
if(restore_scene)
set_scene_bg(re->main, re->scene);
}
/* helper call to detect if theres a composite with render-result node */