Merge branch 'master' into blender2.8
[blender.git] / source / blender / windowmanager / intern / wm_files_link.c
index 3c7a48662f813c20376929548e4e5a5c25f63e41..ff37765b683a00b6384ad2542b657e991914b756 100644 (file)
@@ -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;