Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 11:52:04 +0000 (13:52 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2018 11:52:04 +0000 (13:52 +0200)
commiteb63b32deea5772a5947cb6b77d2a89b1d22e6d1
tree81f6754a8424058d4d97713d2e674dd3a403700f
parent41176cd3d820649488ec5a5475d5dc7e97a01a59
parentbdc1108e8cd8bf51e95de72d10862b4466dac8ca
Merge branch 'master' into blender2.8
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/screen/screen_user_menu.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/windowmanager/intern/wm_operators.c