diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-08 15:11:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-08 15:11:54 +0400 |
| commit | 21eb8b92a0acaaeebfe54073de1f3fd076174d10 (patch) | |
| tree | 8801fd9d0e12de4f889badfecace3c43e2aff028 /source/blender/blenkernel/intern/sound.c | |
| parent | 011a3645bf1d587101ec7cb9bf6a0a0d1421802a (diff) | |
use newly added ID_BLEND_PATH() in more places.
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 73d0d70778f..f2d92154c66 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -340,20 +340,13 @@ void sound_load(struct Main *bmain, struct bSound* sound) #endif { char fullpath[FILE_MAX]; - char *path; /* load sound */ PackedFile* pf = sound->packedfile; /* dont modify soundact->sound->name, only change a copy */ BLI_strncpy(fullpath, sound->name, sizeof(fullpath)); - - if(sound->id.lib) - path = sound->id.lib->filepath; - else - path = bmain->name; - - BLI_path_abs(fullpath, path); + BLI_path_abs(fullpath, ID_BLEND_PATH(bmain, &sound->id)); /* but we need a packed file then */ if (pf) |