archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Core ==

Browse Source 
Fixed fixup code in readfile, that makes old files load with
correct FPS.
This commit is contained in:
Peter Schlaile
2007-10-21 19:19:53 +00:00
parent 8bcfafa3d9
commit 477a8c30fa
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender.h
View File

@@ -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

18
source/blender/blenloader/intern/readfile.c
View File

@@ -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! */