[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27575] branches/render25: Sound bugfixes:
Brecht Van Lommel
brecht at blender.org
Wed Mar 17 17:13:49 CET 2010
Revision: 27575
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27575
Author: blendix
Date: 2010-03-17 17:13:49 +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.
Modified Paths:
--------------
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/source/blender/blenloader/intern/readblenentry.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/blenloader/intern/readfile.h
Modified: branches/render25/release/scripts/ui/space_sequencer.py
===================================================================
--- branches/render25/release/scripts/ui/space_sequencer.py 2010-03-17 16:02:29 UTC (rev 27574)
+++ branches/render25/release/scripts/ui/space_sequencer.py 2010-03-17 16:13:49 UTC (rev 27575)
@@ -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: branches/render25/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readblenentry.c 2010-03-17 16:02:29 UTC (rev 27574)
+++ branches/render25/source/blender/blenloader/intern/readblenentry.c 2010-03-17 16:13:49 UTC (rev 27575)
@@ -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: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c 2010-03-17 16:02:29 UTC (rev 27574)
+++ branches/render25/source/blender/blenloader/intern/readfile.c 2010-03-17 16:13:49 UTC (rev 27575)
@@ -10778,7 +10778,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;
@@ -10790,7 +10790,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: branches/render25/source/blender/blenloader/intern/readfile.h
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.h 2010-03-17 16:02:29 UTC (rev 27574)
+++ branches/render25/source/blender/blenloader/intern/readfile.h 2010-03-17 16:13:49 UTC (rev 27575)
@@ -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