[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30567] branches/soc-2010-nexyon/source/ blender/blenkernel/intern/sound.c: Fix for sound not possible to load when file unsaved.

[Joerg Mueller]

Revision: 30567
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30567
Author:   nexyon
Date:     2010-07-21 09:52:53 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
Fix for sound not possible to load when file unsaved.

Modified Paths:
--------------
    branches/soc-2010-nexyon/source/blender/blenkernel/intern/sound.c

Modified: branches/soc-2010-nexyon/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/soc-2010-nexyon/source/blender/blenkernel/intern/sound.c   
2010-07-21 07:24:52 UTC (rev 30566)
+++ branches/soc-2010-nexyon/source/blender/blenkernel/intern/sound.c   
2010-07-21 07:52:53 UTC (rev 30567)
@@ -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);
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs