Fix T47961: Wipe effects should have 2 inputs
authorCampbell Barton <ideasman42@gmail.com>
Tue, 29 Mar 2016 19:33:35 +0000 (06:33 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 29 Mar 2016 19:33:35 +0000 (06:33 +1100)
source/blender/blenkernel/intern/seqeffects.c
source/blender/makesrna/intern/rna_sequencer.c

index 9cf4328f13e936e53b73a72f7126fde50a4e1333..1b807adca4b3ee8efe053487227fa4f91d209cb8 100644 (file)
@@ -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)
index 856dc8bfb0d6f04ee75b4b6577c6751c88c3c404..e8a45e6a77dc6d92183fa08a8c63ae2289e9489b 100644 (file)
@@ -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",