[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41622] trunk/blender/source/blender: use macro for access to library filepath

[Campbell Barton]

Revision: 41622
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41622
Author:   campbellbarton
Date:     2011-11-07 15:55:03 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
use macro for access to library filepath

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/bpath.c
    trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/bpath.c 2011-11-07 15:53:40 UTC 
(rev 41621)
+++ trunk/blender/source/blender/blenlib/intern/bpath.c 2011-11-07 15:55:03 UTC 
(rev 41622)
@@ -362,7 +362,7 @@
 void bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int 
flag, void *bpath_user_data)
 {
        Image *ima;
-       const char *absbase= (flag & BPATH_TRAVERSE_ABS) ? (id->lib ? 
id->lib->filepath : bmain->name) : NULL;
+       const char *absbase= (flag & BPATH_TRAVERSE_ABS) ? ID_BLEND_PATH(bmain, 
id) : NULL;
 
        if ((flag & BPATH_TRAVERSE_SKIP_LIBRARY) && id->lib) {
                return;

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_ops.c    
2011-11-07 15:53:40 UTC (rev 41621)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_ops.c    
2011-11-07 15:55:03 UTC (rev 41622)
@@ -100,7 +100,7 @@
 {
        FileBrowseOp *fbo= op->customdata;
        ID *id;
-       char *base, *str, path[FILE_MAX];
+       char *str, path[FILE_MAX];
        const char *path_prop= RNA_struct_find_property(op->ptr, "directory") ? 
"directory" : "filepath";
        
        if (RNA_property_is_set(op->ptr, path_prop)==0 || fbo==NULL)
@@ -113,10 +113,9 @@
                char name[FILE_MAX];
                
                id = fbo->ptr.id.data;
-               base = (id && id->lib)? id->lib->filepath: G.main->name;
 
                BLI_strncpy(path, str, FILE_MAX);
-               BLI_path_abs(path, base);
+               BLI_path_abs(path, id ? ID_BLEND_PATH(G.main, id) : 
G.main->name);
                
                if(BLI_is_dir(path)) {
                        str = MEM_reallocN(str, strlen(str)+2);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c        
2011-11-07 15:53:40 UTC (rev 41621)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c        
2011-11-07 15:55:03 UTC (rev 41622)
@@ -733,7 +733,7 @@
        /* send the OnSave event */
        for (li= G.main->library.first; li; li= li->id.next) {
                if (BLI_path_cmp(li->filepath, filepath) == 0) {
-                       BKE_reportf(reports, RPT_ERROR, "Can't overwrite used 
library '%.200s'", filepath);
+                       BKE_reportf(reports, RPT_ERROR, "Can't overwrite used 
library '%.240s'", filepath);
                        return -1;
                }
        }

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