Merged changes in the trunk up to revision 26719.

[blender-staging.git] / source / blender / render / intern / source / pipeline.c

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 5279d971d4913c09b908d755f8bb13467bb0d90d..266c4505f2547a054feacd83106ea651a47a432c 100644 (file)
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1231,6 +1231,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);
@@ -2616,10 +2623,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)) {