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:
authorAntony Riakiotakis <kalast@gmail.com>2015-07-02 20:30:50 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-07-02 20:30:50 +0300
commit5709b9951eed094f6bcfb00ba22b4807dd81873b (patch)
tree4a15613b3ff953e572c5a1624cf6e19f0a921fd6 /source/blender/editors/space_sequencer/sequencer_add.c
parent1d930382e67e4779b3c87ccdd311a043b89ca107 (diff)
parent00808eb39ac04c484fcabac6b18666cb2a0191e7 (diff)
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_add.c')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_add.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 5b95a418dc2..4faaec28d1b 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -1041,6 +1041,9 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op)
else if (seq->type == SEQ_TYPE_ADJUSTMENT) {
seq->blend_mode = SEQ_TYPE_CROSS;
}
+ else if (seq->type == SEQ_TYPE_TEXT) {
+ seq->blend_mode = SEQ_TYPE_ALPHAOVER;
+ }
/* an unset channel is a special case where we automatically go above
* the other strips. */