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/speaker.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/speaker.c')
| -rw-r--r-- | source/blender/blenkernel/intern/speaker.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index 8fb12d5db16..a91d8657179 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -74,9 +74,11 @@ Speaker *BKE_speaker_copy(Main *bmain, Speaker *spk) spkn = BKE_libblock_copy(bmain, &spk->id); - BKE_id_expand_local(&spkn->id, true); + if (spkn->sound) + id_us_plus(&spkn->sound->id); if (ID_IS_LINKED_DATABLOCK(spk)) { + BKE_id_expand_local(&spkn->id); BKE_id_lib_local_paths(G.main, spk->id.lib, &spkn->id); } @@ -101,7 +103,7 @@ void BKE_speaker_make_local(Main *bmain, Speaker *spk) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &spk->id); - BKE_id_expand_local(&spk->id, false); + BKE_id_expand_local(&spk->id); } else { Speaker *spk_new = BKE_speaker_copy(bmain, spk); |