[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52431] trunk/blender/source/blender/ blenloader/intern/readfile.c: Prevent division by zero in tiles size versioning code when mixing

[Sergey Sharybin]

Revision: 52431
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52431
Author:   nazgul
Date:     2012-11-21 09:58:44 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Prevent division by zero in tiles size versioning code when mixing
using current trunk and previous release.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-11-21 09:36:36 UTC (rev 52430)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-11-21 09:58:44 UTC (rev 52431)
@@ -8313,11 +8313,17 @@
 
 			for (scene = main->scene.first; scene; scene = scene->id.next) {
 				if (scene->r.tilex == 0 || scene->r.tiley == 1) {
-					/* scene could be set for panoramic rendering, so clamp with the
-					 * lowest possible tile size value
-					 */
-					scene->r.tilex = max_ii(scene->r.xsch * scene->r.size / scene->r.xparts / 100, 8);
-					scene->r.tiley = max_ii(scene->r.ysch * scene->r.size / scene->r.yparts / 100, 8);
+					if (scene->r.xparts && scene->r.yparts) {
+						/* scene could be set for panoramic rendering, so clamp with the
+						 * lowest possible tile size value
+						 */
+						scene->r.tilex = max_ii(scene->r.xsch * scene->r.size / scene->r.xparts / 100, 8);
+						scene->r.tiley = max_ii(scene->r.ysch * scene->r.size / scene->r.yparts / 100, 8);
+					}
+					else {
+						/* happens when mixing using current trunk and previous release */
+						scene->r.tilex = scene->r.tiley = 64;
+					}
 				}
 			}
 		}