diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 13:31:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-30 13:31:11 +0400 |
| commit | 9e5b28cd42a3cf87ac76e3b27b52dce08071d244 (patch) | |
| tree | eb14ff117faf3f6c524ea0a09389da313044d105 /source/blender/blenkernel/intern/library.c | |
| parent | 274080025d315dc08f9291bddc6d4235ed0fc8e0 (diff) | |
| parent | c9edbab08a4854ad6e79abdfaaee65e0f9301ac0 (diff) | |
svn merge ^/trunk/blender -r42261:42290
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 4155551763e..28524668bd3 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -136,9 +136,9 @@ * from id_make_local() but then the make local functions would not be self * contained. * also note that the id _must_ have a library - campbell */ -void BKE_id_lib_local_paths(Main *bmain, ID *id) +void BKE_id_lib_local_paths(Main *bmain, Library *lib, ID *id) { - char *bpath_user_data[2]= {bmain->name, (id)->lib->filepath}; + char *bpath_user_data[2]= {bmain->name, lib->filepath}; bpath_traverse_id(bmain, id, bpath_relocate_visitor, @@ -1278,7 +1278,7 @@ int new_id(ListBase *lb, ID *id, const char *tname) don't have other library users. */ void id_clear_lib_data(Main *bmain, ID *id) { - BKE_id_lib_local_paths(bmain, id); + BKE_id_lib_local_paths(bmain, id->lib, id); id->lib= NULL; id->flag= LIB_LOCAL; |