[Bf-blender-cvs] [085fa2e] master: Fix T44329: Second part: prevent 'cachebuffer' and 'fullOSA' in preview renders.

[Bastien Montagne]

Commit: 085fa2e3d7c002396c031fa907c7bd6e6f8b3541
Author: Bastien Montagne
Date:   Fri Apr 10 13:16:05 2015 +0200
Branches: master
https://developer.blender.org/rB085fa2e3d7c002396c031fa907c7bd6e6f8b3541

Fix T44329: Second part: prevent 'cachebuffer' and 'fullOSA' in preview renders.

===================================================================

M	source/blender/editors/render/render_internal.c

===================================================================

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 2e447be..fbfe8d9 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -1230,10 +1230,10 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda
 	if ((update_flag & (PR_UPDATE_RENDERSIZE | PR_UPDATE_DATABASE)) || rstats->convertdone == 0) {
 		RenderData rdata;
 
-		/* no osa, blur, seq, layers, etc for preview render */
+		/* no osa, blur, seq, layers, savebuffer etc for preview render */
 		rdata = rp->scene->r;
 		rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA);
-		rdata.scemode &= ~(R_DOSEQ | R_DOCOMP | R_FREE_IMAGE);
+		rdata.scemode &= ~(R_DOSEQ | R_DOCOMP | R_FREE_IMAGE | R_EXR_TILE_FILE | R_FULL_SAMPLE);
 		rdata.scemode |= R_VIEWPORT_PREVIEW;
 
 		/* we do use layers, but only active */