Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 20 Apr 2018 08:49:14 +0000 (10:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 20 Apr 2018 08:49:14 +0000 (10:49 +0200)
1  2 
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c