From 5882355a566c6b65334886049abe25fe821a0ef7 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Sun, 7 Feb 2010 18:06:12 +0000 Subject: Patch by matd (on irc). Disables save buffers and full sample when render border is turned on (render doesn't work otherwise because save buffers doesn't support border rendering). --- source/blender/render/intern/source/pipeline.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index db8d7e317a0..f679b35c627 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1227,6 +1227,13 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer * #ifdef WITH_OPENEXR if(re->r.scemode & R_FULL_SAMPLE) re->r.scemode |= R_EXR_TILE_FILE; /* enable automatic */ + + /* Until use_border is made compatible with save_buffers/full_sample, render without the later instead of not rendering at all.*/ + if(re->r.mode & R_BORDER) + { + re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE); + } + #else /* can't do this without openexr support */ re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE); @@ -2608,10 +2615,6 @@ static int is_rendering_allowed(Render *re) re->error(re->erh, "No border area selected."); return 0; } - if(re->r.scemode & (R_EXR_TILE_FILE|R_FULL_SAMPLE)) { - re->error(re->erh, "Border render and Buffer-save not supported yet"); - return 0; - } } if(re->r.scemode & (R_EXR_TILE_FILE|R_FULL_SAMPLE)) { -- cgit v1.2.3