Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 18 Oct 2018 18:11:14 +0000 (20:11 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 18 Oct 2018 18:11:14 +0000 (20:11 +0200)
commit9d318da4a7f250350c757c20fd25aa01d18130a6
treecf032efd0132b9c17397a25062285e22bbc4dafb
parent4925bb1ec3186f1884fe5dabe0f23fb0b3613e4b
parent1d05f0dc22e3fedfed3b1691eac3ece26a06a17b
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/blendfile.c