Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 02:24:17 +0000 (13:24 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 02:24:17 +0000 (13:24 +1100)
commitdc312609dd346e40f106976fe1ac5d9ad99e8c20
tree422189e0333115777cc999de35ef9486af1c6663
parent1965db2be20f3ea3cdafcfe55dd8708897f850a9
parentdd8469608bc80369929cc7ddb95b553ecbe20e88
Merge branch 'master' into blender2.8
source/blender/windowmanager/intern/wm_files.c