diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-04-10 22:15:24 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-04-10 22:15:24 +0400 |
| commit | 2afae38019d9031f683f52046c23bd5ae896685b (patch) | |
| tree | c1e82676c573f1429c540486a7009f70d48fb167 /source | |
| parent | dbd300910815692294e8919b6ea21e934731d2c8 (diff) | |
Bugfix #26842
Compositor: when using RenderLayer nodes from other scenes and FSA,
Blender crashed because these nodes didn't get a 'tag' for refresh.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 68ed956781d..645d0ac0578 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2303,9 +2303,12 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree) tag_scenes_for_render(re); for(re1= RenderGlobal.renderlist.first; re1; re1= re1->next) { - if(re1->scene->id.flag & LIB_DOIT) - if(re1->r.scemode & R_FULL_SAMPLE) + if(re1->scene->id.flag & LIB_DOIT) { + if(re1->r.scemode & R_FULL_SAMPLE) { read_render_result(re1, sample); + ntreeCompositTagRender(re1->scene); /* ensure node gets exec to put buffers on stack */ + } + } } } |