bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merging revision 30567 from my GSoC branch, log: Fix for sound not possible to load when file unsaved.

Browse Source
This commit is contained in:
Joerg Mueller 2010-07-21 07:55:53 +00:00
parent 51bd50f746
commit d17ce0f148
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/sound.c
View File

@ -122,10 +122,15 @@ struct bSound* sound_new_file(struct Main *bmain, char* filename)
bSound* sound = NULL;
char str[FILE_MAX];
char *path;
int len;
strcpy(str, filename);
BLI_path_abs(str, bmain->name);
path = /*bmain ? bmain->name :*/ G.sce;
BLI_path_abs(str, path);
len = strlen(filename);
while(len > 0 && filename[len-1] != '/' && filename[len-1] != '\\')
@ -258,7 +263,7 @@ void sound_load(struct Main *bmain, struct bSound* sound)
if(sound->id.lib)
path = sound->id.lib->filepath;
else
path = bmain ? bmain->name : G.sce;
path = /*bmain ? bmain->name :*/ G.sce;
BLI_path_abs(fullpath, path);