Differential D290 Diff 869 source/blender/render/intern/source/pipeline.c

Changeset View

Standalone View

source/blender/render/intern/source/pipeline.c

Show First 20 Lines • Show All 1,934 Lines • ▼ Show 20 Lines	#endif
}		}
}		}

/* composite */		/* composite */
if (ntree) {		if (ntree) {
ntreeCompositTagRender(re->scene);		ntreeCompositTagRender(re->scene);
ntreeCompositTagAnimated(ntree);		ntreeCompositTagAnimated(ntree);

ntreeCompositExecTree(ntree, &re->r, TRUE, G.background == 0, &re->scene->view_settings, &re->scene->display_settings);		ntreeCompositExecTree(re->scene, 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 */		/* ensure we get either composited result or the active layer */
RE_AcquireResultImage(re, &rres);		RE_AcquireResultImage(re, &rres);

/* accumulate with filter, and clip */		/* accumulate with filter, and clip */
mask = (1 << sample);		mask = (1 << sample);
mask_array(mask, filt);		mask_array(mask, filt);
▲ Show 20 Lines • Show All 179 Lines • ▼ Show 20 Lines	if (ntree && re->scene->use_nodes && re->r.scemode & R_DOCOMP) {
R.stats_draw = re->stats_draw;		R.stats_draw = re->stats_draw;

if (update_newframe)		if (update_newframe)
BKE_scene_update_for_newframe(re->eval_ctx, re->main, re->scene, re->lay);		BKE_scene_update_for_newframe(re->eval_ctx, re->main, re->scene, re->lay);

if (re->r.scemode & R_FULL_SAMPLE)		if (re->r.scemode & R_FULL_SAMPLE)
do_merge_fullsample(re, ntree);		do_merge_fullsample(re, ntree);
else {		else {
ntreeCompositExecTree(ntree, &re->r, TRUE, G.background == 0, &re->scene->view_settings, &re->scene->display_settings);		ntreeCompositExecTree(re->scene, ntree, &re->r, TRUE, G.background == 0, &re->scene->view_settings, &re->scene->display_settings);
}		}

ntree->stats_draw = NULL;		ntree->stats_draw = NULL;
ntree->test_break = NULL;		ntree->test_break = NULL;
ntree->progress = NULL;		ntree->progress = NULL;
ntree->tbh = ntree->sdh = ntree->prh = NULL;		ntree->tbh = ntree->sdh = ntree->prh = NULL;
}		}
}		}
▲ Show 20 Lines • Show All 955 Lines • Show Last 20 Lines