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)
commit22872857d443f9251dfb474296601c2dfdc5da76
tree32a92e135f020abab410d951490ef89a91b1d8df
parent57f1475b182b34a2c06bd3992859b79166f9b18d
parentb500f427009f01caa0d30e0de79bf92729a2c7ff
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/blendfile.c
source/blender/windowmanager/intern/wm_init_exit.c