[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30568] trunk/blender/source/blender/ blenkernel/intern/sound.c: Merging revision 30567 from my GSoC branch, log: Fix for sound not possible to load when file unsaved.
Joerg Mueller
nexyon at gmail.com
Wed Jul 21 09:55:53 CEST 2010
Revision: 30568
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30568
Author: nexyon
Date: 2010-07-21 09:55:53 +0200 (Wed, 21 Jul 2010)
Log Message:
-----------
Merging revision 30567 from my GSoC branch, log: Fix for sound not possible to load when file unsaved.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30567
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sound.c
Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c 2010-07-21 07:52:53 UTC (rev 30567)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c 2010-07-21 07:55:53 UTC (rev 30568)
@@ -122,11 +122,16 @@
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] != '\\')
len--;
@@ -258,7 +263,7 @@
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);
More information about the Bf-blender-cvs
mailing list