archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Added callback to compositor, so it can print in RenderWindow header the

Browse Source 
current to-be composited node and amount of memory in use.
This commit is contained in:
Ton Roosendaal
2006-02-14 18:04:25 +00:00
parent 86e9faad70
commit acb5f6e79f
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -931,6 +931,14 @@ int composite_needs_render(Scene *sce)
return 0;
}
/* bad call... need to think over proper method still */
static void render_composit_stats(char *str)
{
R.i.infostr= str;
R.stats_draw(&R.i);
R.i.infostr= NULL;
}
static void do_render_final(Render *re)
{
/* we set start time here, for main Blender loops */
@@ -944,10 +952,11 @@ static void do_render_final(Render *re)
do_render_seq(re->result, re->r.cfra);
}
else {
bNodeTree *ntree= re->scene->nodetree;
if(composite_needs_render(re->scene)) {
/* save memory... free all cached images */
ntreeFreeCache(re->scene->nodetree);
ntreeFreeCache(ntree);
/* now use renderdata and camera to set viewplane */
RE_SetCamera(re, re->scene->camera);
@@ -960,17 +969,17 @@ static void do_render_final(Render *re)
render_one_frame(re);
}
if(!re->test_break() && re->scene->nodetree) {
ntreeCompositTagRender(re->scene->nodetree);
ntreeCompositTagAnimated(re->scene->nodetree);
if(!re->test_break() && ntree) {
ntreeCompositTagRender(ntree);
ntreeCompositTagAnimated(ntree);
if(re->r.scemode & R_DOCOMP) {
/* checks if there are render-result nodes that need scene */
ntree_render_scenes(re);
re->i.infostr= "Compositing";
re->stats_draw(&re->i);
ntreeCompositExecTree(re->scene->nodetree, &re->r, G.background==0);
ntree->stats_draw= render_composit_stats;
ntreeCompositExecTree(ntree, &re->r, G.background==0);
ntree->stats_draw= NULL;
}
}
}