Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 02:14:53 +0000 (12:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 5 Sep 2018 02:14:53 +0000 (12:14 +1000)
commite1751415dc9a2c5287bda8116f501a6fb2d55a1a
treefb60d328e96f01c0ad7a00c06075b6d4d9779237
parent312af01fb4faa7d1ff0dea4d2ef936caa9af4c67
parentbb6a94fa7b28390ea8c22a6026562b0ab6685f92
Merge branch 'master' into blender2.8
source/blender/editors/space_sequencer/sequencer_edit.c