Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Wed, 24 May 2017 22:43:01 +0000 (00:43 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Wed, 24 May 2017 22:43:01 +0000 (00:43 +0200)
commit45ff4a807a2acee29cb82c04f294ab58348627b6
tree61f615073b01e911710e5273d93190b333f2831f
parentaec76fdcc64a5fa6238ff25df0907e3f722eeec6
parenta033a7bef9be0ab69edbccbcf49f8af3816fe1eb
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenloader/intern/versioning_270.c