diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-03-29 22:33:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-05 11:36:10 +0300 |
| commit | 37a785241be351bd491b768647e5359101b0abca (patch) | |
| tree | 89926324f9c1be7cc001a39551679d8adea12454 /source/blender | |
| parent | 2ad02b63e58a9ee85e6d2da4b7e49df353a172a5 (diff) | |
Fix T47961: Wipe effects should have 2 inputs
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 1f0c354922e..984e3c4d381 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1545,7 +1545,7 @@ static void init_wipe_effect(Sequence *seq) static int num_inputs_wipe(void) { - return 1; + return 2; } static void free_wipe_effect(Sequence *seq) diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 856dc8bfb0d..e8a45e6a77d 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2387,7 +2387,7 @@ static EffectInfo def_effects[] = { {"TransformSequence", "Transform Sequence", "Sequence strip applying affine transformations to other strips", rna_def_transform, 1}, {"WipeSequence", "Wipe Sequence", "Sequence strip creating a wipe transition", - rna_def_wipe, 1}, + rna_def_wipe, 2}, {"GaussianBlurSequence", "Gaussian Blur Sequence", "Sequence strip creating a gaussian blur", rna_def_gaussian_blur, 1}, {"TextSequence", "Text Sequence", "Sequence strip creating text", |