Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Mar 2017 17:53:07 +0000 (04:53 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Mar 2017 17:53:07 +0000 (04:53 +1100)
commit104a03beed67d8f9f51fbe87c00b92ee19e5174f
tree894ee91727794a2e22db87d275b62e01098b0d1c
parentfce0ff0a3134579f5084f8ae61bec3599cc09db1
parentc832354e330c575a5c450cf0febebb7cc058df87
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/readfile.h
source/blender/editors/render/render_preview.c
source/blender/windowmanager/intern/wm_files.c