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)
commit3c524178bcbbcf3fd9b98f24409481ed061a38aa
tree8e096617b41c2b346286177757093b930d8da28a
parent36773e35f6009693562330137435271922758b95
parent88bbb68ad01bed841fad9ad26a68510f298e6f3b
Merge branch 'master' into blender2.8
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c