Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 9 Jun 2018 16:58:14 +0000 (18:58 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 9 Jun 2018 16:58:14 +0000 (18:58 +0200)
commit45a5ddb57b2a94fde25d9ffab6dfd1bdd312152c
treee89c3263245e8d2f90b6ff897d67f6daf4b3485d
parent419a813938f7dc39a96145aefae680413c93dfe8
parent2e14b7fb9770ba5d7ca75f8125c73b81be8f632c
Merge branch 'master' into blender2.8
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_layout.c
source/blender/makesrna/intern/rna_ui_api.c