Commit: 7500f6c9d98b76f3841d892e719c4959b09a4058
Author: Bastien Montagne
Date: Tue Oct 18 14:15:59 2016 +0200
Branches: master
https://developer.blender.org/rB7500f6c9d98b76f3841d892e719c4959b09a4058
Fix: Append 'Object proxy' hack checking for local/linked usages before those
flags were set!
Dummy mistake, to be backported to 2.78a.
===================================================================
M source/blender/blenkernel/intern/library.c
===================================================================
diff --git a/source/blender/blenkernel/intern/library.c
b/source/blender/blenkernel/intern/library.c
index 93bf5e1..8b09e51 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;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
