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)
commit84d39ab97bba5d4885a062363c8b3f3d28cb7da7
treeddb66f67c6ea1ceafd4aefb07e96f06c26505550
parentbaaf81e13edc2b25dee7af67f49e7a731d057513
parente4b54f44c1b19069de5818d47ce899c690e9b56d
Merge branch 'master' into blender2.8
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