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)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/creator/creator.c

Simple merge