[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22818] branches/blender2.5/blender/source /blender/blenloader/intern: Fix for sounds with relative paths not being loaded correctly.

[Joerg Mueller]

Revision: 22818
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22818
Author:   nexyon
Date:     2009-08-27 11:52:41 +0200 (Thu, 27 Aug 2009)

Log Message:
-----------
Fix for sounds with relative paths not being loaded correctly.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.h

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c	2009-08-27 08:54:33 UTC (rev 22817)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readblenentry.c	2009-08-27 09:52:41 UTC (rev 22818)
@@ -331,11 +331,7 @@
 	fd = blo_openblenderfile(file, reports);
 	if (fd) {
 		fd->reports= reports;
-		bfd= blo_read_file_internal(fd);
-		if (bfd) {
-			bfd->type= BLENFILETYPE_BLEND;
-			strncpy(bfd->main->name, file, sizeof(bfd->main->name)-1);
-		}
+		bfd= blo_read_file_internal(fd, file);
 		blo_freefiledata(fd);			
 	}
 
@@ -350,11 +346,7 @@
 	fd = blo_openblendermemory(mem, memsize,  reports);
 	if (fd) {
 		fd->reports= reports;
-		bfd= blo_read_file_internal(fd);
-		if (bfd) {
-			bfd->type= BLENFILETYPE_BLEND;
-			strcpy(bfd->main->name, "");
-		}
+		bfd= blo_read_file_internal(fd, "");
 		blo_freefiledata(fd);			
 	}
 
@@ -383,11 +375,7 @@
 		/* makes lookup of existing images in old main */
 		blo_make_image_pointer_map(fd, oldmain);
 		
-		bfd= blo_read_file_internal(fd);
-		if (bfd) {
-			bfd->type= BLENFILETYPE_BLEND;
-			strcpy(bfd->main->name, "");
-		}
+		bfd= blo_read_file_internal(fd, "");
 		
 		/* ensures relinked images are not freed */
 		blo_end_image_pointer_map(fd, oldmain);

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-27 08:54:33 UTC (rev 22817)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-27 09:52:41 UTC (rev 22818)
@@ -9700,7 +9700,7 @@
 	return bhead;
 }
 
-BlendFileData *blo_read_file_internal(FileData *fd)
+BlendFileData *blo_read_file_internal(FileData *fd, char *file)
 {
 	BHead *bhead= blo_firstbhead(fd);
 	BlendFileData *bfd;
@@ -9711,6 +9711,9 @@
 
 	bfd->main->versionfile= fd->fileversion;
 	
+	bfd->type= BLENFILETYPE_BLEND;
+	strncpy(bfd->main->name, file, sizeof(bfd->main->name)-1);
+
 	while(bhead) {
 		switch(bhead->code) {
 		case DATA:
@@ -11131,7 +11134,7 @@
 		return NULL;
 
 	fd->reports= reports;
-	bfd= blo_read_file_internal(fd);
+	bfd= blo_read_file_internal(fd, "");
 	blo_freefiledata(fd);
 
 	return bfd;

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.h	2009-08-27 08:54:33 UTC (rev 22817)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.h	2009-08-27 09:52:41 UTC (rev 22818)
@@ -108,7 +108,7 @@
 void blo_join_main(ListBase *mainlist);
 void blo_split_main(ListBase *mainlist, struct Main *main);
 
-BlendFileData *blo_read_file_internal(FileData *fd);
+BlendFileData *blo_read_file_internal(FileData *fd, char *file);
 
 FileData *blo_openblenderfile(char *name, struct ReportList *reports);
 FileData *blo_openblendermemory(void *buffer, int buffersize, struct ReportList *reports);