diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-21 13:25:00 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-21 13:25:00 +0400 |
| commit | 2ea8a71d877f55f229b75fcfbff5fd9eff801629 (patch) | |
| tree | c304e2bf77198654cb2a48984d1e06802ffff23b | |
| parent | 6b2c4dfe734efa738d5e698eeb478003b5279f80 (diff) | |
2.5: move some do_versions compatibility code under < 253 check.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index de2a3cd47cc..bf31f6ac818 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10853,12 +10853,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } - /* put 2.50 compatibility code here until next subversion bump */ + if (main->versionfile < 253) { Object *ob; Scene *scene; bScreen *sc; Tex *tex; + Brush *brush; for (sc= main->screen.first; sc; sc= sc->id.next) { ScrArea *sa; @@ -10974,12 +10975,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) SEQ_END } } - } - { /* GSOC 2010 Sculpt - New settings for Brush */ - Brush *brush; for (brush= main->brush.first; brush; brush= brush->id.next) { /* Sanity Check */ @@ -11052,6 +11050,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } + /* put 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 editors/interface/resources.c! */ |