[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51515] trunk/blender/source/blender: Fix related to #32933: UV unwrap had 0.0 margin by default in .blend files ,

[Brecht Van Lommel]

Revision: 51515
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51515
Author:   blendix
Date:     2012-10-22 18:48:50 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Fix related to #32933: UV unwrap had 0.0 margin by default in .blend files,
change it now to 0.001 in existing files.

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

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-10-22 18:19:55 UTC (rev 51514)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-10-22 18:48:50 UTC (rev 51515)
@@ -42,7 +42,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         264
-#define BLENDER_SUBVERSION      4
+#define BLENDER_SUBVERSION      5
 
 /* 262 was the last editmesh release but it has compatibility code for bmesh data */
 #define BLENDER_MINVERSION      262

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-22 18:19:55 UTC (rev 51514)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-22 18:48:50 UTC (rev 51515)
@@ -8145,6 +8145,18 @@
 			do_version_node_cleanup_dynamic_sockets_264(NULL, NULL, ntree);
 	}
 
+	if (main->versionfile < 264 || (main->versionfile == 264 && main->subversionfile < 5)) {
+		/* set a unwrapping margin and ABF by default */
+		Scene *scene;
+
+		for (scene=main->scene.first; scene; scene=scene->id.next) {
+			if (scene->toolsettings->uvcalc_margin == 0.0f) {
+				scene->toolsettings->uvcalc_margin = 0.001f;
+				scene->toolsettings->unwrapper = 0;
+			}
+		}
+	}
+
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */