Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 23 Jul 2018 15:52:52 +0000 (17:52 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 23 Jul 2018 15:52:52 +0000 (17:52 +0200)
commitadbccae4b48acdf58d8b715be660ba522a5dfad6
treee0298dc13783d8d25d6656c9bc84dd7e3bf9e08a
parent8876e3aae25ad0e74baf362413b0fd113aa5b638
parentbb98e83b99e63348e0396a5ffe5bb2a20ff1607a
Merge branch 'master' into blender2.8

Note: Moved doversion of VSE strips uniquename to 2.8 versionning area,
and raised accordingly current file subversion, since that bug also
affected previous 2.8 .blend files...

Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_sequencer/sequencer_edit.c