diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 17:15:37 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 17:16:35 +0300 |
commit | 1870e166deaa4ced1bb5226e97e037db10dbd06c (patch) | |
tree | 9d6e51e7b210efcde111ebf246211c2c44e9c8fe /source/blender/blenkernel/intern/object.c | |
parent | d9cc3ea2c6e8cfd17612c35a82050cb01d8070ec (diff) |
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 9c48fdfbf08..d736a455163 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1169,10 +1169,7 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches) /* Copy runtime surve data. */ obn->curve_cache = NULL; - if (ID_IS_LINKED_DATABLOCK(ob)) { - BKE_id_expand_local(&obn->id); - BKE_id_lib_local_paths(bmain, ob->id.lib, &obn->id); - } + BKE_id_copy_ensure_local(bmain, &ob->id, &obn->id); /* Do not copy object's preview (mostly due to the fact renderers create temp copy of objects). */ obn->preview = NULL; |