diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:27:15 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:30:02 +0300 |
| commit | 7212ebd09f9720883581221be923ae5e97ff5d76 (patch) | |
| tree | 546606626647d473ae9d4a037ce8e24e17943e08 /source/blender/blenkernel/intern/image.c | |
| parent | 3b8e0606e1cfa484971d09c5060a78dbadbe1569 (diff) | |
Remove usercount handling from BKE_id_expand_local.
Idea looked good, but we have too much custom situations here (some half-fake-sub-ID
being copied with their 'owner', animdata, etc.), let's let datablock copy functions
handle that themselves.
Also allows to safely call BKE_id_expand_local from all copy functions now (only when
copying linked data).
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index ae5c2b80c21..f6f38977402 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -462,6 +462,7 @@ Image *BKE_image_copy(Main *bmain, Image *ima) nima->preview = BKE_previewimg_copy(ima->preview); if (ID_IS_LINKED_DATABLOCK(ima)) { + BKE_id_expand_local(&nima->id); BKE_id_lib_local_paths(bmain, ima->id.lib, &nima->id); } @@ -486,7 +487,7 @@ void BKE_image_make_local(Main *bmain, Image *ima) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &ima->id); - BKE_id_expand_local(&ima->id, false); + BKE_id_expand_local(&ima->id); } else { Image *ima_new = BKE_image_copy(bmain, ima); |