diff options
| author | Peter Schlaile <peter@schlaile.de> | 2007-10-21 23:19:53 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2007-10-21 23:19:53 +0400 |
| commit | 477a8c30fa46bf4832d590e957f6c842ed874562 (patch) | |
| tree | 361e5c599f28057bb325a28e08eb5c6d82bf9ac4 /source | |
| parent | 8bcfafa3d935bf339bd497efe02f489d61e085bd (diff) | |
== Core ==
Fixed fixup code in readfile, that makes old files load with
correct FPS.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 73af56b9123..7f7ea79fcc6 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -44,7 +44,7 @@ struct ListBase; struct MemFile; #define BLENDER_VERSION 245 -#define BLENDER_SUBVERSION 5 +#define BLENDER_SUBVERSION 6 #define BLENDER_MINVERSION 240 #define BLENDER_MINSUBVERSION 0 diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d667486b447..d07f05ddab1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6751,13 +6751,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) ima->aspx = ima->aspy = 1.0f; } - /* fix frs_sec_base */ - for(sce= main->scene.first; sce; sce= sce->id.next) { - if (sce->r.frs_sec_base == 0) { - sce->r.frs_sec_base = 1; - } - } - } if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 4)) { @@ -6781,7 +6774,18 @@ static void do_versions(FileData *fd, Library *lib, Main *main) sce->r.fg_stamp[0] = sce->r.fg_stamp[1] = sce->r.fg_stamp[2] = 0.8; } } + + if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 6)) { + Scene *sce; + /* fix frs_sec_base */ + for(sce= main->scene.first; sce; sce= sce->id.next) { + if (sce->r.frs_sec_base == 0) { + sce->r.frs_sec_base = 1; + } + } + } + /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ /* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */ |