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)
1  2 
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