diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-18 23:28:08 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-18 23:28:08 +0300 |
| commit | 01616f9ed2da14b5cad40efac03d1a22dbb759f3 (patch) | |
| tree | 4955ad12f260e557aa1c0f724a320e565f8bce5c /source/blender/blenkernel/intern/blendfile_link_append.c | |
| parent | f06d361da1249c93568153bae88bcdf43b4774a1 (diff) | |
| parent | 314b27850ccb6d103cf5c73855187cfc11ec48d8 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxel
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile_link_append.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile_link_append.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c index be2abdbfb69..da48365a43e 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.c +++ b/source/blender/blenkernel/intern/blendfile_link_append.c @@ -1187,6 +1187,11 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList * BLI_assert(ID_IS_LINKED(id)); BLI_assert(id->newid != NULL); + /* Do NOT delete a linked data that was already linked before this append. */ + if (id->tag & LIB_TAG_PRE_EXISTING) { + continue; + } + id->tag |= LIB_TAG_DOIT; item->new_id = id->newid; } |