Merging r58144 through r58147 form trunk into soc-2013-depsgraph_mt

[blender.git] / 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 971dc49577c57c7b50bf7d12f983b581982ca025..0d368fe44f1816d220fee1554e748ca4dda84a58 100644 (file)
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -904,7 +904,7 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda
        
        rstats = RE_GetStats(re);
 
        
        rstats = RE_GetStats(re);
 

-       if ((update_flag & (PR_UPDATE_RENDERSIZE|PR_UPDATE_DATABASE)) || rstats->convertdone == 0) {
+       if ((update_flag & (PR_UPDATE_RENDERSIZE | PR_UPDATE_DATABASE)) || rstats->convertdone == 0) {

                /* no osa, blur, seq, layers, etc for preview render */
                rdata = rp->scene->r;
                rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA);
                /* no osa, blur, seq, layers, etc for preview render */
                rdata = rp->scene->r;
                rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA);