Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 29 Oct 2018 04:23:02 +0000 (15:23 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 29 Oct 2018 04:23:02 +0000 (15:23 +1100)
commitcf1cf105a0d10fb4b99d9ff01fc75520dacaacfd
treeb145acc4a42b57bf0a3691e6881fa0192ed59ecb
parent95150b8414c119b4acb8f26fd19e800e5c42e4a0
parent7367c0bde4636e2b87d5e795556b9ce162f8eb7e
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c