[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42434] trunk/blender/source/blender: fix for dscale which was set to 0, 0, 0 from files saved between Nov 29 and Dec 4.

[Campbell Barton]

Revision: 42434
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42434
Author:   campbellbarton
Date:     2011-12-05 11:02:54 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
fix for dscale which was set to 0,0,0 from files saved between Nov 29 and Dec 4.

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	2011-12-05 07:56:31 UTC (rev 42433)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2011-12-05 11:02:54 UTC (rev 42434)
@@ -42,7 +42,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION			260
-#define BLENDER_SUBVERSION		6
+#define BLENDER_SUBVERSION		7
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-12-05 07:56:31 UTC (rev 42433)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-12-05 11:02:54 UTC (rev 42434)
@@ -12642,6 +12642,18 @@
 			}
 		}
 	}
+	/* sigh, this dscale vs dsize version patching was not done right, fix for fix,
+	 * this intentionally checks an exact subversion, also note this was never in a release,
+	 * at some point this could be removed. */
+	else if (main->versionfile == 260 && main->subversionfile == 6)
+	{
+		Object *ob;
+		for (ob= main->object.first; ob; ob= ob->id.next) {
+			if (is_zero_v3(ob->dscale)) {
+				fill_vn_fl(ob->dscale, 3, 1.0f);
+			}
+		}
+	}
 
 	/* put compatibility code here until next subversion bump */
 	{