[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27581] trunk/blender: Sound bugfixes:

Brecht Van Lommel brecht at blender.org
Wed Mar 17 22:38:55 CET 2010


Revision: 27581
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27581
Author:   blendix
Date:     2010-03-17 22:38:53 +0100 (Wed, 17 Mar 2010)

Log Message:
-----------
Sound bugfixes:
* sound file path was not displayed in sequencer panel.
* sound strip with relative paths would stop working after undo.
(commit 27575 by Brecht from render25 branch)

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/blenloader/intern/readblenentry.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/readfile.h

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2010-03-17 21:33:28 UTC (rev 27580)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2010-03-17 21:38:53 UTC (rev 27581)
@@ -609,7 +609,7 @@
         layout.template_ID(strip, "sound", open="sound.open")
 
         layout.separator()
-        layout.prop(strip.sound, "filepath", text="")
+        layout.prop(strip, "filepath", text="")
 
         row = layout.row()
         if strip.sound.packed_file:

Modified: trunk/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readblenentry.c	2010-03-17 21:33:28 UTC (rev 27580)
+++ trunk/blender/source/blender/blenloader/intern/readblenentry.c	2010-03-17 21:38:53 UTC (rev 27581)
@@ -377,7 +377,7 @@
 		/* makes lookup of existing images in old main */
 		blo_make_image_pointer_map(fd, oldmain);
 		
-		bfd= blo_read_file_internal(fd, "");
+		bfd= blo_read_file_internal(fd, filename);
 		
 		/* ensures relinked images are not freed */
 		blo_end_image_pointer_map(fd, oldmain);

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-03-17 21:33:28 UTC (rev 27580)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-03-17 21:38:53 UTC (rev 27581)
@@ -10736,7 +10736,7 @@
 	return bhead;
 }
 
-BlendFileData *blo_read_file_internal(FileData *fd, char *file)
+BlendFileData *blo_read_file_internal(FileData *fd, const char *filename)
 {
 	BHead *bhead= blo_firstbhead(fd);
 	BlendFileData *bfd;
@@ -10748,7 +10748,7 @@
 	bfd->main->versionfile= fd->fileversion;
 	
 	bfd->type= BLENFILETYPE_BLEND;
-	strncpy(bfd->main->name, file, sizeof(bfd->main->name)-1);
+	strncpy(bfd->main->name, filename, sizeof(bfd->main->name)-1);
 
 	while(bhead) {
 		switch(bhead->code) {

Modified: trunk/blender/source/blender/blenloader/intern/readfile.h
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.h	2010-03-17 21:33:28 UTC (rev 27580)
+++ trunk/blender/source/blender/blenloader/intern/readfile.h	2010-03-17 21:38:53 UTC (rev 27581)
@@ -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, char *file);
+BlendFileData *blo_read_file_internal(FileData *fd, const char *filename);
 
 FileData *blo_openblenderfile(char *name, struct ReportList *reports);
 FileData *blo_openblendermemory(void *buffer, int buffersize, struct ReportList *reports);





More information about the Bf-blender-cvs mailing list