diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_sound.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 9 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sound/sound_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sound.c | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 09cea572deb..190b0400aff 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -62,7 +62,7 @@ void sound_cache(struct bSound* sound, int ignore); void sound_delete_cache(struct bSound* sound); -void sound_load(struct bSound* sound); +void sound_load(struct Main *main, struct bSound* sound); void sound_free(struct bSound* sound); diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 78340288836..5bbb3506a78 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -486,7 +486,7 @@ int unpackSound(ReportList *reports, bSound *sound, int how) freePackedFile(sound->packedfile); sound->packedfile = 0; - sound_load(sound); + sound_load(NULL, sound); ret_value = RET_OK; } diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index b2e5209a4fc..5c3047942f7 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -143,7 +143,7 @@ struct bSound* sound_new_file(struct Main *bmain, char* filename) BLI_strncpy(sound->name, filename, FILE_MAX); // XXX unused currently sound->type = SOUND_TYPE_FILE; - sound_load(sound); + sound_load(bmain, sound); if(!sound->playback_handle) { @@ -169,7 +169,7 @@ struct bSound* sound_new_buffer(struct bContext *C, struct bSound *source) sound->child_sound = source; sound->type = SOUND_TYPE_BUFFER; - sound_load(sound); + sound_load(CTX_data_main(C), sound); if(!sound->playback_handle) { @@ -195,7 +195,7 @@ struct bSound* sound_new_limiter(struct bContext *C, struct bSound *source, floa sound->end = end; sound->type = SOUND_TYPE_LIMITER; - sound_load(sound); + sound_load(CTX_data_main(C), sound); if(!sound->playback_handle) { @@ -236,7 +236,7 @@ void sound_delete_cache(struct bSound* sound) } } -void sound_load(struct bSound* sound) +void sound_load(struct Main *UNUSED(bmain), struct bSound* sound) { if(sound) { @@ -266,6 +266,7 @@ void sound_load(struct bSound* sound) if(sound->id.lib) path = sound->id.lib->filepath; else + // XXX this should be fixed! path = /*bmain ? bmain->name :*/ G.sce; BLI_path_abs(fullpath, path); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 7c8c7eb6e5d..ebd407e7e21 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5308,7 +5308,7 @@ static void lib_link_sound(FileData *fd, Main *main) sound->id.flag -= LIB_NEEDLINK; sound->ipo= newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system - sound_load(sound); + sound_load(main, sound); if(sound->cache) sound_cache(sound, 1); diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 2be3a51869b..18f35502f8b 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -180,7 +180,7 @@ static int pack_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; sound->packedfile= newPackedFile(op->reports, sound->name); - sound_load(sound); + sound_load(CTX_data_main(C), sound); return OPERATOR_FINISHED; } diff --git a/source/blender/makesrna/intern/rna_sound.c b/source/blender/makesrna/intern/rna_sound.c index 0c217837226..674fbbad9c6 100644 --- a/source/blender/makesrna/intern/rna_sound.c +++ b/source/blender/makesrna/intern/rna_sound.c @@ -38,7 +38,7 @@ static void rna_Sound_filepath_update(Main *bmain, Scene *scene, PointerRNA *ptr) { - sound_load((bSound*)ptr->data); + sound_load(bmain, (bSound*)ptr->data); } static int rna_Sound_caching_get(PointerRNA *ptr) |