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

Silly copy/paste error enabled the 'save render to file' option always...

Browse Source 
now the button works as meant to be.

Still working on the feature though... I noticed exr files dont read
back when only part was saved (on user break). Working...
This commit is contained in:
Ton Roosendaal 2006-03-15 10:18:33 +00:00
parent e91dddc923
commit 6bc3f0f85e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1162,6 +1162,7 @@ static void threaded_tile_processor(Render *re)
if(rr->exrhandle) {
IMB_exr_close(rr->exrhandle);
rr->exrhandle= NULL;
if(!re->test_break())
read_render_result(re);
}
@ -1224,7 +1225,7 @@ static void render_scene(Render *re, Scene *sce, int cfra)
sce->r.cfra= cfra;
if(R_EXR_TILE_FILE)
if(re->scene->r.scemode & R_EXR_TILE_FILE)
resc->flag |= R_FILEBUFFER;
/* makes render result etc */
@ -1363,11 +1364,13 @@ static void do_render_final(Render *re)
if(!re->test_break()) {
ntree->stats_draw= render_composit_stats;
ntree->test_break= re->test_break;
/* in case it was never initialized */
R.stats_draw= re->stats_draw;
ntreeCompositExecTree(ntree, &re->r, G.background==0);
ntree->stats_draw= NULL;
ntree->test_break= NULL;
}
}
}
@ -1464,7 +1467,7 @@ static int render_initialize_from_scene(Render *re, Scene *scene)
disprect.ymax= winy;
}
if(R_EXR_TILE_FILE) {
if(scene->r.scemode & R_EXR_TILE_FILE) {
int partx= winx/scene->r.xparts, party= winy/scene->r.yparts;
/* stupid exr tiles dont like different sizes */
if(winx != partx*scene->r.xparts || winy != party*scene->r.xparts) {