diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-18 15:15:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-18 15:17:10 +0300 |
| commit | 7500f6c9d98b76f3841d892e719c4959b09a4058 (patch) | |
| tree | d7396fec74ed12dd2629c4d96008c96515ad9e3c /source/blender/blenkernel/intern/library.c | |
| parent | ab4c921e82a37d1a34879b0db7fd125749691272 (diff) | |
Fix: Append 'Object proxy' hack checking for local/linked usages before those flags were set!
Dummy mistake, to be backported to 2.78a.
Diffstat (limited to 'source/blender/blenkernel/intern/library.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 93bf5e1949e..8b09e51a2d3 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1713,6 +1713,8 @@ void BKE_library_make_local(Main *bmain, const Library *lib, const bool untagged if (id->newid) { bool is_local = false, is_lib = false; + BKE_library_ID_test_usages(bmain, id, &is_local, &is_lib); + /* Attempt to re-link copied proxy objects. This allows appending of an entire scene * from another blend file into this one, even when that blend file contains proxified * armatures that have local references. Since the proxified object needs to be linked @@ -1752,7 +1754,6 @@ void BKE_library_make_local(Main *bmain, const Library *lib, const bool untagged id_us_ensure_real(id->newid); } - BKE_library_ID_test_usages(bmain, id, &is_local, &is_lib); if (!is_local && !is_lib) { BKE_libblock_free(bmain, id); do_loop = true; |