diff options
| author | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
| commit | 790025c01ed76c06e69e6054f1a718ca57771e28 (patch) | |
| tree | 7461d495f199142172b0efa34e5ad75ea65def6a /source/blender/blenkernel/intern/sequencer.c | |
| parent | 99efebd2dd24a8e0827cf0f13bc40c2844946676 (diff) | |
| parent | 8d671f6f6550605ac738f7a9727375a024614837 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# source/blender/editors/screen/screen_ops.c
# source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 1b8939db185..424f4269f3c 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -4505,7 +4505,8 @@ Sequence *BKE_sequencer_foreground_frame_get(Scene *scene, int frame) /* Only use strips that generate an image, not ones that combine * other strips or apply some effect. */ if (ELEM(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_META, SEQ_TYPE_SCENE, - SEQ_TYPE_MOVIE, SEQ_TYPE_COLOR, SEQ_TYPE_TEXT)) { + SEQ_TYPE_MOVIE, SEQ_TYPE_COLOR, SEQ_TYPE_TEXT)) + { if (seq->machine > best_machine) { best_seq = seq; best_machine = seq->machine; |