forked from bartvdbraak/blender
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)
This commit is contained in:
parent
29a83cbfa7
commit
634b750cbb
@ -609,7 +609,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel):
|
||||
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:
|
||||
|
@ -377,7 +377,7 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, const char *filename, MemFil
|
||||
/* 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);
|
||||
|
@ -10736,7 +10736,7 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
|
||||
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 @@ BlendFileData *blo_read_file_internal(FileData *fd, char *file)
|
||||
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) {
|
||||
|
@ -108,7 +108,7 @@ struct Main;
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user