From 881f0b145641abe75f37fcbd48b4d659c634c0fe Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 4 Jul 2013 14:11:42 +0000 Subject: Revert revision 57896 to fix Make Local > All with multi user datablocks. It's causing problems with link/append, needs some deeper changes but it's too close to release for that. --- source/blender/blenkernel/intern/library.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/library.c') diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 16e858fc087..4dc1e9be7ed 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1573,9 +1573,10 @@ void BKE_library_make_local(Main *bmain, Library *lib, bool untagged_only) { if (lib == NULL || id->lib == lib) { if (id->lib) { - /* try make local, if not implemented fall back */ - if (!id_make_local(id, false)) - id_clear_lib_data(bmain, id); + /* for Make Local > All we should be calling id_make_local, + * but doing that breaks append (see #36003 and #36006), we + * we should make it work with all datablocks and id.us==0 */ + id_clear_lib_data(bmain, id); /* sets 'id->flag' */ /* why sort alphabetically here but not in * id_clear_lib_data() ? - campbell */ -- cgit v1.2.3