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:
authorJörg Müller <nexyon@gmail.com>2016-01-09 04:35:30 +0300
committerJörg Müller <nexyon@gmail.com>2016-01-09 04:35:30 +0300
commit85d675963665300d3049b42cc5d70547380557ee (patch)
tree13cbde1ace794c1642b10c016f0caeaca58cff54 /source/blender/makesrna/intern/rna_sequencer.c
parentf39aa170586e2d713488ad81eaec46893db0f0fe (diff)
Audaspace: Sequencer sound bugfix and mono UI.
- Fixed a bug that the sound when changed in the properties panel was not updated. - Added the option to make a sound mono while adding a sound strip. - Added the option to make a sound mono in the sequencer properties panel. Related bug report: T47140
Diffstat (limited to 'source/blender/makesrna/intern/rna_sequencer.c')
-rw-r--r--source/blender/makesrna/intern/rna_sequencer.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 221bf4b59b3..fd9a6f3dbdb 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -721,6 +721,14 @@ static void rna_Sequence_filepath_update(Main *bmain, Scene *UNUSED(scene), Poin
rna_Sequence_update(bmain, scene, ptr);
}
+static void rna_Sequence_sound_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+ Sequence *seq = (Sequence *) ptr->data;
+
+ BKE_sound_update_scene_sound(seq->scene_sound, seq->sound);
+ rna_Sequence_update(bmain, scene, ptr);
+}
+
static int seqproxy_seq_cmp_cb(Sequence *seq, void *arg_pt)
{
SequenceSearchData *data = arg_pt;
@@ -2024,7 +2032,7 @@ static void rna_def_sound(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_struct_type(prop, "Sound");
RNA_def_property_ui_text(prop, "Sound", "Sound data-block used by this sequence");
- RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
+ RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_sound_update");
prop = RNA_def_property(srna, "volume", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "volume");