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)
commitca67cdb73c82182ba1f231220ff7080d0a3abb7a
treef306b6a827939e74a6d85a92b4b77b0d99a12026
parent3e6f5f3643475b69e1ed9b87e5f512f345ec0c94
parentc6c49d90dc6856f978e15d80673c6211dcba6fd9
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c