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/material.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/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 5583702aab3..17811893c03 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -246,8 +246,9 @@ Material *BKE_material_copy(Main *bmain, Material *ma) man->preview = BKE_previewimg_copy(ma->preview); BLI_listbase_clear(&man->gpumaterial); - + if (ID_IS_LINKED_DATABLOCK(ma)) { + BKE_id_expand_local(&man->id); BKE_id_lib_local_paths(bmain, ma->id.lib, &man->id); } @@ -302,7 +303,7 @@ void BKE_material_make_local(Main *bmain, Material *ma) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &ma->id); - BKE_id_expand_local(&ma->id, false); + BKE_id_expand_local(&ma->id); } else { Material *ma_new = BKE_material_copy(bmain, ma); |