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)
1  2 
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenloader/intern/versioning_270.c