Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 19:10:43 +0000 (21:10 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 19:10:43 +0000 (21:10 +0200)
1  2 
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_widgets.c