Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-10-15 16:54:12 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-10-15 16:54:12 +0400
commitf5cc313d9da08a3425cc0e4248f71d6b79364390 (patch)
tree5cf7a139810e5477b637591a6aba20fb16fb06fe /source/blender
parent0325f5e7369a4d8d2d8b057fab35c20f2ddcfb28 (diff)
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.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/render/intern/source/initrender.c19
1 files changed, 9 insertions, 10 deletions
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);