From 1ac4b1d5c366c2213497e10050c27090a7421af7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 21 Jan 2007 00:09:24 +0000 Subject: [PATCH] Fix for bug #5709: Join triangle threshold was initialized for wrong subversion. --- source/blender/blenloader/intern/readfile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 53b39c9bac8..faee9b73704 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6342,10 +6342,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } - - /* improved triangle to quad conversion settings */ - for(sce= main->scene.first; sce; sce=sce->id.next) - sce->toolsettings->jointrilimit = 0.8f; } if(main->subversionfile < 4) { @@ -6354,6 +6350,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main) sce->r.bake_filter= 2; sce->r.bake_osa= 5; sce->r.bake_flag= R_BAKE_CLEAR; + + /* improved triangle to quad conversion settings */ + if(sce->toolsettings->jointrilimit==0.0f) + sce->toolsettings->jointrilimit = 0.8f; } } }