Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 Aug 2017 21:14:02 +0000 (07:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 Aug 2017 21:14:02 +0000 (07:14 +1000)
1  2 
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c