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)
1  2 
source/blender/editors/interface/interface_handlers.c
source/blender/windowmanager/WM_types.h