Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 08:56:12 +0000 (10:56 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 08:56:12 +0000 (10:56 +0200)
commitb89307acfd71955000662232b5964edcdfef5ccf
tree504c24627c2ebeb680439092b3205e859aac2cdf
parentea6fef938500f9405e7d6ff39297164b95d2811a
parenta42fd3de5d82deff4b7d9b1f14a58fd95d9d20ff
Merge branch 'master' into blender2.8
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h