diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-15 23:38:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-15 23:38:52 +0400 |
| commit | ca906df5ccdd0d1b0a600f073b5bad5251d42e07 (patch) | |
| tree | 7edcdbbd5875c67ee310c03e89100ec9ec4c3e81 | |
| parent | 3da40611d914e6177dd25e41baf5a6c5c4fe7154 (diff) | |
2.5: Increase subversion, to avoid doing 2.5 do_versions code each time.
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 19b9c315939..4fe1eec55c0 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -43,7 +43,7 @@ struct bContext; struct ReportList; #define BLENDER_VERSION 250 -#define BLENDER_SUBVERSION 0 +#define BLENDER_SUBVERSION 1 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 72d7c61778f..7e0e74430fc 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9353,11 +9353,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } 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 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } + /* 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! */ |