Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Nov 2017 14:16:10 +0000 (01:16 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Nov 2017 14:16:10 +0000 (01:16 +1100)
commitc1da6c9d7dd602c961fc5ada4e19266936357950
tree60612831263da718ccf074b0552e8c775974df08
parentf7d59fbc460cd2e544c855d8088c98aacf90cfdd
parent25f2abf314d02df0896e7678a31434d7b895b3d9
Merge branch 'master' into blender2.8
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_widgets.c