Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 22 Nov 2017 16:26:00 +0000 (03:26 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 22 Nov 2017 16:26:00 +0000 (03:26 +1100)
commit73c4ba18d50bc03465927e22b5d0085bf7d523a2
tree17d1877bd52ae5e3598e16cb52f42f3be17a9125
parent15a0ad602746bd8dd7dde3822d54979e72ca9de2
parent326efb431971e668a41d9a331ccc3d11f9fd3e5f
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_blendfile.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/blendfile.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c