[Bf-blender-cvs] [912f46d] master: Fix pretty stupid mistake in last 'append fix' commit (rB50c017b6eabd).
Bastien Montagne
noreply at git.blender.org
Sun Aug 7 10:03:50 CEST 2016
Commit: 912f46d309b3c1c2ec581a44ec77fed38cbe6aad
Author: Bastien Montagne
Date: Sun Aug 7 10:02:17 2016 +0200
Branches: master
https://developer.blender.org/rB912f46d309b3c1c2ec581a44ec77fed38cbe6aad
Fix pretty stupid mistake in last 'append fix' commit (rB50c017b6eabd).
===================================================================
M source/blender/blenkernel/intern/library.c
===================================================================
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index c981edf..c551726 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1662,12 +1662,12 @@ void BKE_library_make_local(Main *bmain, const Library *lib, const bool untagged
/* Do not explicitly make local non-linkable IDs (shapekeys, in fact), they are assumed to be handled
* by real datablocks responsible of them. */
- const bool do_skip = (id && BKE_idcode_is_linkable(GS(id->name)));
+ const bool do_skip = (id && !BKE_idcode_is_linkable(GS(id->name)));
for (; id; id = id_next) {
id->newid = NULL;
id_next = id->next; /* id is possibly being inserted again */
-
+
/* The check on the second line (LIB_TAG_PRE_EXISTING) is done so its
* possible to tag data you don't want to be made local, used for
* appending data, so any libdata already linked wont become local
More information about the Bf-blender-cvs
mailing list