Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 Jul 2018 09:44:04 +0000 (11:44 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 Jul 2018 09:44:04 +0000 (11:44 +0200)
commit11cd9b054150c6208a781f7b72a14dfb94ec0c25
treed4765685ae742520a866113525c04e74d01828c5
parentccc9f476cae786790e62303069f938a4f1cd2b14
parent2b963ecb81d9854d4d3c3e761ee04d6d500c05c0
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/versioning_legacy.c