From 1870e166deaa4ced1bb5226e97e037db10dbd06c Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 25 Jul 2016 16:15:37 +0200 Subject: Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function. --- source/blender/blenkernel/intern/speaker.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern/speaker.c') diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index 80ee6d50d7e..ee6886e3fb2 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -77,10 +77,7 @@ Speaker *BKE_speaker_copy(Main *bmain, Speaker *spk) 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); - } + BKE_id_copy_ensure_local(bmain, &spk->id, &spkn->id); return spkn; } -- cgit v1.2.3