diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-05-23 11:23:11 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-05-23 11:23:11 +0300 |
commit | 58c4b10a708fbc24bca105dbf26dd991154c91ad (patch) | |
tree | c9779fb218d71487b8f313ee37be79ce0778351f | |
parent | 8389cc7e674bd54102a0244fa625ff4d49b678bf (diff) | |
parent | 054dbb833e15275e0e991e2c15e754a3e7583716 (diff) |
Merge branch 'blender2.7'
Conflicts:
source/blender/blenkernel/intern/library_remap.c
-rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index e0e473978f8..802f13ea69f 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -287,6 +287,13 @@ static int foreach_libblock_remap_callback(void *user_data, ID *id_self, ID **id if (!is_indirect || is_obj_proxy) { id_remap_data->status |= ID_REMAP_IS_LINKED_DIRECT; } + /* We need to remap proxy_from pointer of remapped proxy... sigh. */ + if (is_obj_proxy && new_id != NULL) { + Object *ob = (Object *)id; + if (ob->proxy == (Object *)new_id) { + ob->proxy->proxy_from = ob; + } + } } } |