Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Nov 2017 13:31:47 +0000 (00:31 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Nov 2017 13:31:47 +0000 (00:31 +1100)
1  2 
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_widgets.c