diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-27 02:57:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-27 02:59:36 +0300 |
| commit | e6be5b8a2cdbfb9e62ef6bed83da841846cdfd1e (patch) | |
| tree | 83311b2dce654f76858888ae640baf661d55210c /source/blender/windowmanager/intern/wm_files_link.c | |
| parent | 03b46f7941e17906b193db39f1ff4339b02b58c6 (diff) | |
| parent | b796ce0f26c1bf206194eb8c004d214806c2828b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files_link.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files_link.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 3c7a48662f8..ff37765b683 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -672,7 +672,8 @@ static void lib_relocate_do( } /* Note that in reload case, we also want to replace indirect usages. */ - const short remap_flags = ID_REMAP_SKIP_NEVER_NULL_USAGE | (do_reload ? 0 : ID_REMAP_SKIP_INDIRECT_USAGE); + const short remap_flags = ID_REMAP_SKIP_NEVER_NULL_USAGE | ID_REMAP_NO_INDIRECT_PROXY_DATA_USAGE | + (do_reload ? 0 : ID_REMAP_SKIP_INDIRECT_USAGE); for (item_idx = 0, itemlink = lapp_data->items.list; itemlink; item_idx++, itemlink = itemlink->next) { WMLinkAppendDataItem *item = itemlink->link; ID *old_id = item->customdata; |