Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 25 Jan 2018 11:20:27 +0000 (22:20 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 25 Jan 2018 11:20:27 +0000 (22:20 +1100)
commit58362939906b31fce02b8f9598f4321e83971b7d
tree063fc98223075259e7ec2abe97ede97748d69af8
parentfd4d7fbf131a02862b93915d65559d66177a6f18
parent2d46ea52cdd69f929ad7efe8e482cfc0a16de35f
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface_handlers.c
source/blender/windowmanager/WM_types.h