kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Sequencer now outputs float buffers to render too, when available.

Browse Source
This commit is contained in:
Ton Roosendaal 2006-03-12 19:00:48 +00:00
parent 3be24f8fef
commit afc3d1ade3
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1305,9 +1305,6 @@ static void do_render_final(Render *re)
re->i.starttime= PIL_check_seconds_timer();
if(re->r.scemode & R_DOSEQ) {
if (!re->result->rect32) {
re->result->rect32= MEM_callocT(sizeof(int)*re->rectx*re->recty, "do_render_final rectot");
}
if(!re->test_break())
do_render_seq(re->result, re->r.cfra);
}

22
source/blender/src/sequence.c
View File

@ -1279,7 +1279,7 @@ void free_imbuf_seq()
END_SEQ
}
/* bad levell call... renderer makes a 32 bits rect to put result in */
/* bad levell call... */
void do_render_seq(RenderResult *rr, int cfra)
{
ImBuf *ibuf;
@ -1287,20 +1287,32 @@ void do_render_seq(RenderResult *rr, int cfra)
G.f |= G_PLAYANIM; /* waitcursor patch */
ibuf= give_ibuf_seq(rr->rectx, rr->recty, cfra, 0);
if(ibuf && rr->rect32) {
printf("copied\n");
if(ibuf) {
if(ibuf->rect_float) {
if (!rr->rectf)
rr->rectf= MEM_mallocN(4*sizeof(float)*rr->rectx*rr->recty, "render_seq rectf");
memcpy(rr->rectf, ibuf->rect_float, 4*sizeof(float)*rr->rectx*rr->recty);
}
else if(ibuf->rect) {
if (!rr->rect32)
rr->rect32= MEM_mallocN(sizeof(int)*rr->rectx*rr->recty, "render_seq rect");
memcpy(rr->rect32, ibuf->rect, 4*rr->rectx*rr->recty);
/* if (ibuf->zbuf) { */
/* if (R.rectz) freeN(R.rectz); */
/* R.rectz = BLI_dupallocN(ibuf->zbuf); */
/* } */
}
/* Let the cache limitor take care of this (schlaile) */
/* no, doesnt seem to work for float buffer? (ton) */
/* While render let's keep all memory available for render (ton) */
free_imbuf_seq_except(cfra);
}
G.f &= ~G_PLAYANIM;
}