Fix for #34739 and #35060, avoid ambiguity in compositor viewer nodes.
[blender.git] / source / blender / render / intern / source / pipeline.c
index 5510c07e19c9eca2b299cf9594b533a45572b589..0a92e09e6643d418ba54b5631b6a195df5010f6c 100644 (file)
@@ -1732,7 +1732,7 @@ static void do_merge_fullsample(Render *re, bNodeTree *ntree)
                        ntreeCompositTagRender(re->scene);
                        ntreeCompositTagAnimated(ntree);
                        
-                       ntreeCompositExecTree(ntree, &re->r, 1, G.background == 0, &re->scene->view_settings, &re->scene->display_settings);
+                       ntreeCompositExecTree(ntree, &re->r, TRUE, G.background == 0, &re->scene->view_settings, &re->scene->display_settings);
                }
                
                /* ensure we get either composited result or the active layer */
@@ -1909,7 +1909,7 @@ static void do_render_composite_fields_blur_3d(Render *re)
                                if (re->r.scemode & R_FULL_SAMPLE)
                                        do_merge_fullsample(re, ntree);
                                else {
-                                       ntreeCompositExecTree(ntree, &re->r, 1, G.background == 0, &re->scene->view_settings, &re->scene->display_settings);
+                                       ntreeCompositExecTree(ntree, &re->r, TRUE, G.background == 0, &re->scene->view_settings, &re->scene->display_settings);
                                }
                                
                                ntree->stats_draw = NULL;