diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-01 20:09:22 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-04 19:11:57 +0300 |
commit | 0c32f755a6d06a8607513bb277c6dc04f067d073 (patch) | |
tree | dc5406e259ed26efbf637efe61480dd2c8769ea6 | |
parent | aa177d48c71816a71e1a1815099dd87174a64b52 (diff) |
Fix T47643: Blender crash. Linked speaker issue.
Speaker's localization func would not make direct-linked its used sound datablock...
-rw-r--r-- | source/blender/blenkernel/intern/speaker.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index 3b5b8ce3f9a..c452065fbad 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -81,6 +81,11 @@ Speaker *BKE_speaker_copy(Speaker *spk) return spkn; } +static void extern_local_speaker(Speaker *spk) +{ + id_lib_extern((ID *)spk->sound); +} + void BKE_speaker_make_local(Speaker *spk) { Main *bmain = G.main; @@ -95,6 +100,7 @@ void BKE_speaker_make_local(Speaker *spk) if (spk->id.lib == NULL) return; if (spk->id.us == 1) { id_clear_lib_data(bmain, &spk->id); + extern_local_speaker(spk); return; } @@ -109,6 +115,7 @@ void BKE_speaker_make_local(Speaker *spk) if (is_local && is_lib == false) { id_clear_lib_data(bmain, &spk->id); + extern_local_speaker(spk); } else if (is_local && is_lib) { Speaker *spk_new = BKE_speaker_copy(spk); |