griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Prevent division by zero in tiles size versioning code when mixing

Browse Source 
using current trunk and previous release.
This commit is contained in:
Sergey Sharybin
2012-11-21 09:58:44 +00:00
parent e1d1cc0680
commit ea2e3df152
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenloader/intern/readfile.c
View File

@@ -8313,11 +8313,17 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
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;
}
}
}
}