Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 22 Oct 2018 04:13:43 +0000 (15:13 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 22 Oct 2018 04:13:43 +0000 (15:13 +1100)
commit84eff5c1269f18b063d6b5637efe90f78958cc62
treec2b1035ff71970640dd32277bbd48b59ab03e2c7
parent71466cac1efae5e942596ec25c8787478f8356b0
parent24162c977c2aac79690fa421289a146c0f2677c8
Merge branch 'master' into blender2.8
source/blender/windowmanager/intern/wm_files.c