This commit disables fix for revision 14202 effectively.

The claim was:
Bugfix: don't do full sample merging on re-rendered layers in
the compositor.

But result was that rendering didn't happen at all for scenes
with a composite.

I also don't understand the commit, seems like it's incomplete?
This commit is contained in:
Ton Roosendaal
2008-03-21 22:26:26 +00:00
parent 4c29f3cf09
commit 4e8f06604f

View File

@@ -2156,7 +2156,7 @@ static void do_render_composite_fields_blur_3d(Render *re)
ntreeCompositTagAnimated(ntree);
}
if(!(re->r.scemode & R_COMP_RERENDER)) {
if(1 || !(re->r.scemode & R_COMP_RERENDER)) {
if(ntree && re->r.scemode & R_DOCOMP) {
/* checks if there are render-result nodes that need scene */
if((re->r.scemode & R_SINGLE_LAYER)==0)