[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53186] trunk/blender/source/blender: Another patch for changes in file format...

[Ton Roosendaal]

Revision: 53186
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53186
Author:   ton
Date:     2012-12-19 16:45:47 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Another patch for changes in file format...

- Since 2.50, the .blends have the current file name stored
- In versions up to 2.65.0 this didn't save for files saved from startup
  (i.e. files saved without loading a file)

Code now adds the file name after all, except for recovery loads.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-12-19 16:16:20 UTC (rev 53185)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-12-19 16:45:47 UTC (rev 53186)
@@ -6615,9 +6615,16 @@
 	bfd->globalf = fg->globalf;
 	BLI_strncpy(bfd->filename, fg->filename, sizeof(bfd->filename));
 	
-	/* early 2.50 version patch - filename not in FileGlobal struct */
-	if (fd->fileversion <= 250)
-		BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->main->name));
+	/* error in 2.65 and older: main->name was not set if you save from startup (not after loading file) */
+	if (bfd->filename[0] == 0) {
+		if (fd->fileversion < 265 || (fd->fileversion == 265 && fg->subversion < 1))
+			if ((G.fileflags & G_FILE_RECOVER)==0)
+				BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->filename));
+		
+		/* early 2.50 version patch - filename not in FileGlobal struct at all */
+		if (fd->fileversion <= 250)
+			BLI_strncpy(bfd->filename, bfd->main->name, sizeof(bfd->filename));
+	}
 	
 	if (G.fileflags & G_FILE_RECOVER)
 		BLI_strncpy(fd->relabase, fg->filename, sizeof(fd->relabase));

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2012-12-19 16:16:20 UTC (rev 53185)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2012-12-19 16:45:47 UTC (rev 53186)
@@ -672,7 +672,7 @@
 
 			CLAMP(sv->vec.y, 0, winsizey);
 		}
-}
+	}
 	
 	/* test for collapsed areas. This could happen in some blender version... */
 	/* ton: removed option now, it needs Context... */