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/texture.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/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index a5088e94ada..e34d632f2ca 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -872,12 +872,13 @@ Tex *BKE_texture_copy(Main *bmain, Tex *tex) texn->nodetree = ntreeCopyTree(bmain, tex->nodetree); } + texn->preview = BKE_previewimg_copy(tex->preview); + if (ID_IS_LINKED_DATABLOCK(tex)) { + BKE_id_expand_local(&texn->id); BKE_id_lib_local_paths(bmain, tex->id.lib, &texn->id); } - texn->preview = BKE_previewimg_copy(tex->preview); - return texn; } @@ -935,7 +936,7 @@ void BKE_texture_make_local(Main *bmain, Tex *tex) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &tex->id); - BKE_id_expand_local(&tex->id, false); + BKE_id_expand_local(&tex->id); } else { Tex *tex_new = BKE_texture_copy(bmain, tex); |