Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Dec 2017 12:57:26 +0000 (13:57 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 4 Dec 2017 13:07:39 +0000 (14:07 +0100)
commit47fa3e7b27623f85acba9161e5210507a67742f1
treefcb4eb7d999c2350fa27dee90056e31b7660c3a4
parenta1df65c9ddd3d876904cd4d26da5c2760a52191c
parent0868a2b6109f974edcc11a35c9f1bbd0388a8864
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c