[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12330] trunk/blender/source/blender: == Core ==

[Peter Schlaile]

Revision: 12330
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12330
Author:   schlaile
Date:     2007-10-21 21:19:53 +0200 (Sun, 21 Oct 2007)

Log Message:
-----------
== Core ==

Fixed fixup code in readfile, that makes old files load with
correct FPS.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2007-10-21 17:38:17 UTC (rev 12329)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2007-10-21 19:19:53 UTC (rev 12330)
@@ -44,7 +44,7 @@
 struct MemFile;
 
 #define BLENDER_VERSION			245
-#define BLENDER_SUBVERSION		5
+#define BLENDER_SUBVERSION		6
 
 #define BLENDER_MINVERSION		240
 #define BLENDER_MINSUBVERSION	0

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2007-10-21 17:38:17 UTC (rev 12329)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2007-10-21 19:19:53 UTC (rev 12330)
@@ -6751,13 +6751,6 @@
 			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 @@
 			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! */