From f5cc313d9da08a3425cc0e4248f71d6b79364390 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 15 Oct 2012 12:54:12 +0000 Subject: Clamp minimal tile size with Save Buffers and FSAA enabled That was an old check whether tiled EXRs are used during rendering since version 2.42 where there indeed was a special check for tile size in EXR tile code. Now it seems EXR could handle tiles with non-equal size and no extra tile size check happens for EXR. Anyway EXR tile initialization happens after initparts, so clamping size in initparts should be safe for EXR tiles as well. --- source/blender/render/intern/source/initrender.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'source/blender') diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 88c64b44b64..2b564a09024 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -558,20 +558,19 @@ void initparts(Render *re, int do_crop) xparts = re->r.xparts; yparts = re->r.yparts; - /* mininum part size, but for exr tile saving it was checked already */ - if (!(re->r.scemode & (R_EXR_TILE_FILE | R_FULL_SAMPLE))) { - if (re->r.mode & R_PANORAMA) { - if (ceil(re->rectx / (float)xparts) < 8) - xparts = 1 + re->rectx / 8; - } - else + /* minimum part size */ + if (re->r.mode & R_PANORAMA) { + if (ceil(re->rectx / (float)xparts) < 8) + xparts = 1 + re->rectx / 8; + } + else { if (ceil(re->rectx / (float)xparts) < 64) xparts = 1 + re->rectx / 64; - - if (ceil(re->recty / (float)yparts) < 64) - yparts = 1 + re->recty / 64; } + if (ceil(re->recty / (float)yparts) < 64) + yparts = 1 + re->recty / 64; + /* part size */ partx = ceil(re->rectx / (float)xparts); party = ceil(re->recty / (float)yparts); -- cgit v1.2.3