[Bf-blender-cvs] [e5e8d67] master: Fix T47961: Wipe effects should have 2 inputs
Campbell Barton
noreply at git.blender.org
Tue Mar 29 21:31:47 CEST 2016
Commit: e5e8d67028ba6e0804a29a774224633ae5291003
Author: Campbell Barton
Date: Wed Mar 30 06:33:35 2016 +1100
Branches: master
https://developer.blender.org/rBe5e8d67028ba6e0804a29a774224633ae5291003
Fix T47961: Wipe effects should have 2 inputs
===================================================================
M source/blender/blenkernel/intern/seqeffects.c
M source/blender/makesrna/intern/rna_sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 9cf4328..1b807ad 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 856dc8b..e8a45e6 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",
More information about the Bf-blender-cvs
mailing list