Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 29 Nov 2017 17:13:06 +0000 (18:13 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 29 Nov 2017 17:13:06 +0000 (18:13 +0100)
1  2 
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/makesrna/RNA_access.h

Simple merge