[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22478] branches/blender2.5/blender/source /blender: 2.5: Increase subversion, to avoid doing 2. 5 do_versions code each time.

[Brecht Van Lommel]

Revision: 22478
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22478
Author:   blendix
Date:     2009-08-15 21:38:52 +0200 (Sat, 15 Aug 2009)

Log Message:
-----------
2.5: Increase subversion, to avoid doing 2.5 do_versions code each time.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h	2009-08-15 19:35:03 UTC (rev 22477)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h	2009-08-15 19:38:52 UTC (rev 22478)
@@ -43,7 +43,7 @@
 struct ReportList;
 
 #define BLENDER_VERSION			250
-#define BLENDER_SUBVERSION		0
+#define BLENDER_SUBVERSION		1
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-15 19:35:03 UTC (rev 22477)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-15 19:38:52 UTC (rev 22478)
@@ -9353,11 +9353,6 @@
 	}
 
 	if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 1)) {
-	}
-
-	/* TODO: should be moved into one of the version blocks once this branch moves to trunk and we can
-	   bump the version (or sub-version.) */
-	{
 		Object *ob;
 		Material *ma;
 		Tex *tex;
@@ -9555,6 +9550,10 @@
 		}
 	}
 
+	/* put 2.50 compatibility code here until next subversion bump */
+	{
+	}
+
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */