Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2018 11:33:48 +0000 (13:33 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2018 11:33:48 +0000 (13:33 +0200)
commite04ea9d3c31a63af28d2ea8ef418ad0b8db16bf7
tree120542f27f47f2aed1d9c4e6f1e314fdd7a27970
parentc51b017a1a12ed1bc9001c2e4e47b14e07f53b53
parent53580265118236a096257b50f29d354243bdefe3
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c