Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 03:58:46 +0000 (14:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 03:58:46 +0000 (14:58 +1100)
commitc312cc171b3e85306fb4c0d67f260bac14af2bfe
tree24358e80fc188ff400d04cb37dd8161515881a23
parent28316493bd82f5e5d2be40effdad4431f9c49c6e
parentbae188bf468313993ac9993c4f8dd0bde1cdfa56
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/creator/creator.c