Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 10:00:57 +0000 (12:00 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 10:00:57 +0000 (12:00 +0200)
commit3a566687e1159904fee4ac7aef5daf38fb4e00ed
tree2d5f58d0c97322c81ef55526ec7a775ae66de6c7
parent948f4e8c943e2fb3ef9f9211965f9cdf1db9ed3d
parent677d699645be41acb96f256a1e2088aa21e5e72b
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/readfile.c