Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 12 Aug 2017 15:14:55 +0000 (01:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 12 Aug 2017 15:14:55 +0000 (01:14 +1000)
1  2 
source/blender/blenkernel/intern/blendfile.c
source/blender/windowmanager/intern/wm_init_exit.c