Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/src/buttons_scene.c')
-rw-r--r--source/blender/src/buttons_scene.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 5205be3e1b0..f2e20356f21 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -211,9 +211,15 @@ void do_soundbuts(unsigned short event)
case B_SOUND_MENU_SAMPLE:
if (G.buts->menunr > 0) {
sample = BLI_findlink(samples, G.buts->menunr - 1);
- if (sample && sound) {
+ if (sample && sound && sound->sample != sample) {
+ int wasrelative = (strncmp(sound->name, "//", 2)==0);
+
BLI_strncpy(sound->name, sample->name, sizeof(sound->name));
sound_set_sample(sound, sample);
+
+ if (wasrelative)
+ BLI_makestringcode(G.sce, sound->name);
+
do_soundbuts(B_SOUND_REDRAW);
}
}