Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-08-07 11:02:17 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-08-07 11:02:17 +0300
commit912f46d309b3c1c2ec581a44ec77fed38cbe6aad (patch)
treecfdf779b3324eedda271555f9a8ed2caa2dd89d5 /source
parent566dd4e8a5091ba07c95ad49e891a0b4a3ee8ce2 (diff)
Fix pretty stupid mistake in last 'append fix' commit (rB50c017b6eabd).
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/library.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index c981edf1ba7..c5517265da3 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