[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51341] trunk/blender/source/blender/ render/intern/source/initrender.c: Clamp minimal tile size with Save Buffers and FSAA enabled

[Sergey Sharybin]

Revision: 51341
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51341
Author:   nazgul
Date:     2012-10-15 12:54:12 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/initrender.c

Modified: trunk/blender/source/blender/render/intern/source/initrender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/initrender.c	2012-10-15 11:16:54 UTC (rev 51340)
+++ trunk/blender/source/blender/render/intern/source/initrender.c	2012-10-15 12:54:12 UTC (rev 51341)
@@ -558,20 +558,19 @@
 	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);