diff options
author | Janne Karhu <jhkarh@gmail.com> | 2010-10-30 16:04:00 +0400 |
---|---|---|
committer | Janne Karhu <jhkarh@gmail.com> | 2010-10-30 16:04:00 +0400 |
commit | ef3e5a3d71d1816d31666fa8dc6ad3e81195d7e8 (patch) | |
tree | 938195972bf0bf4c7bbdeffb216df91905faa931 /source/blender/makesrna/intern/rna_sequencer.c | |
parent | a12d0fc8366d459d386f005e8b97bfdb72ea2f26 (diff) |
Fix for [#24374] VSE: Reassign Inputs ignores selection order.
* No way currently to know the order of effect inputs, so I added a swap operator for the inputs.
* Also added the effect inputs to the strip property panel (weren't even in rna before). These are not yet editable, but can be very helpful in determining what the inputs are if the strip is too short to see the name in the timeline.
Diffstat (limited to 'source/blender/makesrna/intern/rna_sequencer.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 923f4560532..4f3af7e9cc1 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -502,6 +502,12 @@ static void rna_Sequence_attenuation_set(PointerRNA *ptr, float value) } +static int rna_Sequence_input_count_get(PointerRNA *ptr) +{ + Sequence *seq= (Sequence*)(ptr->data); + + return get_sequence_effect_num_inputs(seq->type); +} /*static void rna_SoundSequence_filename_set(PointerRNA *ptr, const char *value) { Sequence *seq= (Sequence*)(ptr->data); @@ -985,6 +991,24 @@ static void rna_def_sequence(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Speed factor", "Multiply the current speed of the sequence with this number or remap current frame to this frame"); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); + /* effect strip inputs */ + + prop= RNA_def_property(srna, "input_count", PROP_INT, PROP_UNSIGNED); + RNA_def_property_clear_flag(prop, PROP_EDITABLE); + RNA_def_property_int_funcs(prop, "rna_Sequence_input_count_get", NULL, NULL); + + prop= RNA_def_property(srna, "input_1", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "seq1"); + RNA_def_property_ui_text(prop, "Input 1", "First input for the effect strip"); + + prop= RNA_def_property(srna, "input_2", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "seq2"); + RNA_def_property_ui_text(prop, "Input 2", "Second input for the effect strip"); + + prop= RNA_def_property(srna, "input_3", PROP_POINTER, PROP_NONE); + RNA_def_property_pointer_sdna(prop, NULL, "seq1"); + RNA_def_property_ui_text(prop, "Input 3", "Third input for the effect strip"); + RNA_api_sequence_strip(srna); } |